BUG问题

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/controller/SyCapacityControlController.java

@@ -102,11 +102,11 @@ public class SyCapacityControlController extends JeecgController<SyCapacityContr
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
 		Date date = DateUtils.getDate();
 		//获得原额度
-		SyCapacityControl queryCapacity = syCapacityControlService.getById(syCapacityControl.getId());
-		if(!queryCapacity.getCapacityQuota().equals(syCapacityControl.getCapacityQuota())){
-			//保存 修改时间和额度
-			syCapacityControl.setRemarks(syCapacityControl.getRemarks()+format.format(date)+":"+queryCapacity.getCapacityQuota()+" ");
-		}
+//		SyCapacityControl queryCapacity = syCapacityControlService.getById(syCapacityControl.getId());
+//		if(!queryCapacity.getCapacityQuota().equals(syCapacityControl.getCapacityQuota())){
+//			//保存 修改时间和额度
+//			syCapacityControl.setRemarks(syCapacityControl.getRemarks()+format.format(date)+":"+queryCapacity.getCapacityQuota()+" ");
+//		}
 		syCapacityControlService.updateById(syCapacityControl);
 		return Result.OK("编辑成功!");
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationIngredientMapper.xml

@@ -128,8 +128,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_103_2021.dbo.rdrecords01 rs
 		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select od.csocode
+		where cPOID in (
+		select om.cPOID
 		from UFDATA_103_2021.dbo.PO_POmain om
 		join UFDATA_103_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -142,8 +142,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as jian from UFDATA_103_2021.dbo.rdrecords11 rs
 		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select distinct od.csocode
+		where comcode in (
+		select distinct om.cCode
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -278,8 +278,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_101_2021.dbo.rdrecords01 rs
 		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select od.csocode
+		where cPOID in (
+		select om.cPOID
 		from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_101_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -292,8 +292,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as jian from UFDATA_101_2021.dbo.rdrecords11 rs
 		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select distinct od.csocode
+		where comcode in (
+		select distinct om.cCode
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -410,8 +410,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_103_2021.dbo.rdrecords01 rs
 		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select od.csocode
+		where cPOID in (
+		select om.cPOID
 		from UFDATA_103_2021.dbo.PO_POmain om
 		join UFDATA_103_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -425,8 +425,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as jian from UFDATA_103_2021.dbo.rdrecords11 rs
 		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select distinct od.csocode
+		where comcode in (
+		select distinct om.cCode
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -558,8 +558,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_101_2021.dbo.rdrecords01 rs
 		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select od.csocode
+		where cPOID in (
+		select om.cPOID
 		from UFDATA_101_2021.dbo.PO_POmain om
 		join UFDATA_101_2021.dbo.PO_PODetails od on om.POID=od.POID
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -573,8 +573,8 @@
 		(
 		select i.cInvCode,i.cInvName,sum(rs.iQuantity) as jian from UFDATA_101_2021.dbo.rdrecords11 rs
 		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-		where iordercode in (
-		select distinct od.csocode
+		where comcode in (
+		select distinct om.cCode
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -653,8 +653,8 @@
 		(
 				select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_101_2021.dbo.rdrecords11 rs
 				join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-				where iordercode in (
-						select distinct od.csocode
+				where comcode in (
+						select distinct om.cCode
 						from UFDATA_101_2021.dbo.om_momain om
 						join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
 						join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
@@ -714,8 +714,8 @@
 		(
 				select i.cInvName,sum(rs.iQuantity) as jian,rs.cBatch from UFDATA_103_2021.dbo.rdrecords11 rs
 				join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
-				where iordercode in (
-						select distinct od.csocode
+				where comcode in (
+						select distinct om.cCode
 						from UFDATA_103_2021.dbo.om_momain om
 						join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
 						join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationMapper.xml

@@ -126,7 +126,7 @@
 				)sa ON s.iSOsID = sa.iSOsID
         inner join UFDATA_101_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode 
         inner JOIN UFDATA_101_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
-        WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
+        WHERE cc.cCusCode in ('T020001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
      UNION ALL
 
              SELECT max(ss1.iExchRate) as exchangeRate,min(s1.iTaxUnitPrice) as soPrice,'103' as pkOrg,
@@ -169,7 +169,7 @@
 				)sa ON s1.iSOsID = sa.iSOsID
         inner join UFDATA_101_2021.dbo.Person j on j.cPersonCode=ss1.cPersonCode
         inner JOIN UFDATA_101_2021.dbo.Customer cu ON ss1.cCusCode = cu.cCusCode
-        WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
+        WHERE cc.cCusCode in ('0001') and ss.cCusCode in ('T020001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
 
     </select>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/CostAllocationReview.java

@@ -20,14 +20,20 @@ public class CostAllocationReview {
     @ApiModelProperty(value = "计划单号")
     @Excel(name = "计划单号", width = 15)
     private String planNum;
+    @ApiModelProperty(value = "制单人")
+    @Excel(name = "制单人", width = 15)
+    private String preparedBy;
     //保存日期
     private String createTime;
-    //审批日期
-    private String approvalDate;
     //审批人
     private String approvalMan;
-    /*保存、提交、已指派、返单、完成*/
-    private String status;
+    //审批日期
+    private String approvalDate;
+    //返单日期
+    private String rejectDate;
+    //结束日期
+    private String finalApproveDate;
+
     /**款号*/
     @ApiModelProperty(value = "款号")
     @Excel(name = "产品款号", width = 15)
@@ -36,14 +42,16 @@ public class CostAllocationReview {
     @Excel(name = "外销员", width = 15)
     @ApiModelProperty(value = "业务员")
     private String exportSales;
-    /**成衣合同号*/
-    @ApiModelProperty(value = "成衣合同号")
-    @Excel(name = "成衣合同号", width = 15)
-    private String garmentContractno;
+
     /**部门*/
     @ApiModelProperty(value = "部门")
     @Excel(name = "部门", width = 15)
     private String department;
+    /**成衣合同号*/
+    @ApiModelProperty(value = "成衣合同号")
+    @Excel(name = "成衣合同号", width = 15)
+    private String garmentContractno;
+
     /**客户简称*/
     @ApiModelProperty(value = "客户简称")
     @Excel(name = "客户简称", width = 15)
@@ -69,16 +77,41 @@ public class CostAllocationReview {
     @ApiModelProperty(value = "短出数：计划数量和实际出货数量的差额")
     @Excel(name = "短出数", width = 15)
     private java.math.BigDecimal shortseveral;
+
+        //外销总价
+   private String usdTotalexportprice;
+
+   //外销金额
+   private String rmbExportamount;
+
+   //面料不含税金额
+   private String fabriccostNotincludestax;
+
+   //辅料不含税金额
+   private String excipiencostNotincludestax;
+
+   //加工费人民币
+   private String rmbProcesscost;
+   //加工费美元
+   private String usdProcesscost;
+   // 不含税运杂费(￥)
+   private String rmbExpense;
+   //运杂费($)
+   private String usdExpense;
+   // 事故金额(￥)
+   private String accidentcnyAmount;
+   //事故金额($)
+   private String accidentUsdamount;
+
+   //备注
+   private String remarks;
+
     /**短出货值*/
     @ApiModelProperty(value = "短出货值")
     private java.math.BigDecimal shortvalue;
     /**短出面料成本：单件成本*短出数量*/
     @ApiModelProperty(value = "短出面料成本：单件成本*短出数量")
     private java.math.BigDecimal fabricshortcost;
-    @ApiModelProperty(value = "制单人")
-    @Excel(name = "制单人", width = 15)
-    private String preparedBy;
-
 
     //审批历史对象
     @TableField(exist = false)
@@ -86,4 +119,7 @@ public class CostAllocationReview {
     //当前状态
     @TableField(exist = false)
     private String currentState;
+
+    /*保存、提交、已指派、返单、完成*/
+    private String status;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -248,6 +248,9 @@
         <if test="sy.status != null and sy.status !=''">
             AND a.status = #{sy.status}
         </if>
+        <if test='sy.rejectDate != null and sy.rejectDate !="" and sy.rejectDate == "1"'>
+            AND b.stuta = '驳回'
+        </if>
         group by a.plan_code
     </select>
 
@@ -265,7 +268,22 @@
         cost_info ->> '$.shortseveral'  AS shortseveral,
         cost_info ->> '$.shortvalue'  AS shortvalue,
         cost_info ->> '$.fabricshortcost'  AS fabricshortcost,
-        cost_info ->> '$.preparedBy'  AS preparedBy, status
+        cost_info ->> '$.preparedBy'  AS preparedBy,
+        status,
+
+        cost_info ->> '$.rejectDate'  AS rejectDate,
+        cost_info ->> '$.finalApproveDate'  AS finalApproveDate,
+        cost_info ->> '$.usdTotalexportprice'  AS usdTotalexportprice,
+        cost_info ->> '$.rmbExportamount'  AS rmbExportamount,
+        cost_info ->> '$.fabriccostNotincludestax'  AS fabriccostNotincludestax,
+        cost_info ->> '$.excipiencostNotincludestax'  AS excipiencostNotincludestax,
+        cost_info ->> '$.rmbProcesscost'  AS rmbProcesscost,
+        cost_info ->> '$.usdProcesscost'  AS usdProcesscost,
+        cost_info ->> '$.rmbExpense'  AS rmbExpense,
+        cost_info ->> '$.usdExpense'  AS usdExpense,
+        cost_info ->> '$.accidentcnyAmount'  AS accidentcnyAmount,
+        cost_info ->> '$.accidentUsdamount'  AS accidentUsdamount,
+        cost_info ->> '$.remarks'  AS remarks
         from sy_cost_json
         where 1=1
         <if test="sy.createTime != null and sy.createTime !=''">
@@ -320,7 +338,9 @@
         <if test="sy.preparedBy != null and sy.preparedBy !=''">
             AND JSON_EXTRACT( cost_info, '$.preparedBy' ) LIKE CONCAT('%',#{sy.preparedBy},'%')
         </if>
-
+        <if test='sy.rejectDate != null and sy.rejectDate !="" and sy.rejectDate == "1"'>
+            AND JSON_EXTRACT( cost_info, '$.rejectDate' ) is not null
+        </if>
 
     </select>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/AddOrderJob.java

@@ -127,7 +127,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                         " LEFT JOIN Customer cc ON s.cCusCode = cc.cCusCode" +
                         " LEFT JOIN Person  pe ON s.cPersonCode = pe.cPersonCode" +
                         " left join Vendor v on s.cDefine12=v.cVenName" +
-                        " where s.iStatus = 1  AND (s.cdefine15 is null or  s.cdefine15 !='1' or s.cdefine15 !='2')  ";
+                        " where s.iStatus = 1  AND (s.cdefine15 is null or  s.cdefine15 !='1' and s.cdefine15 !='2')  ";
 
                 if(this.parameter==null || this.parameter.equals("") || this.parameter.equals(" ")){
                     sql=sql+" order by s.dDate desc ";