计划单统计表调整、面辅料获取染厂编码调整

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

@@ -547,7 +547,7 @@ GROUP BY planNo;
         b.processing_time AS frejectDate,
         first_approve_date AS ffirstApproveDate,
         final_approve_date AS ffinalApproveDate,
-        c.processed_by AS msPlanMan,
+        assigned_by AS msPlanMan,
         status AS fstatus
         FROM sy_fabric_loss_report
         left join (SELECT plan_no,min(processing_time) processing_time
@@ -556,8 +556,8 @@ GROUP BY planNo;
         left join (SELECT plan_no,min(processing_time) processing_time
         FROM sy_approval_history where stuta='驳回' GROUP BY plan_no) b
         on plan_code=b.plan_no
-        left join (SELECT plan_no,min(processed_by) processed_by
-        FROM sy_approval_history where stuta='审批通过' GROUP BY plan_no) c
+        left join (SELECT plan_no,min(assigned_by) assigned_by
+        FROM sy_approval_history where stuta='指派' GROUP BY plan_no) c
         on plan_code=c.plan_no
     </select>
 
@@ -583,7 +583,7 @@ GROUP BY planNo;
             a.first_approve_date as cfirstApproveDate, -- 初审通过日期
             c.processing_time AS frejectDate, -- 返单日期
             d.processing_time AS cfinalApproveDate, -- 终审通过日期
-            e.processed_by AS cbPlanMan, -- 审核人
+            e.assigned_by AS cbPlanMan, -- 审核人
             cost_info ->> '$.remarks'  AS remarks
         from sy_cost_json a
         left join (SELECT plan_no,min(processing_time) processing_time
@@ -595,8 +595,8 @@ GROUP BY planNo;
         left join (SELECT plan_no,min(processing_time) processing_time
         FROM sy_cost_approval_history where stuta='审批通过' GROUP BY plan_no) d
         on plan_num=d.plan_no
-        left join (SELECT plan_no,min(processed_by) processed_by
-        FROM sy_cost_approval_history where stuta='审批通过' GROUP BY plan_no) e
+        left join (SELECT plan_no,min(assigned_by) assigned_by
+        FROM sy_cost_approval_history where stuta='指派' GROUP BY plan_no) e
         on plan_num=e.plan_no
          group by a.plan_num
     </select>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -1894,10 +1894,18 @@ public class SyPackingListFabricController implements Job {
 				 fabricItem.setPrice(findExtraInfo.getPrice());
 				 fabricItem.setSupplierCode(findExtraInfo.getSupplierCode());
 				 fabricItem.setSupplier(findExtraInfo.getSupplier());
-				 fabricItem.setSupplierPrintingPlant(findExtraInfo.getSupplierPrintingPlant());
-				 fabricItem.setSupplierDyeingPlant(findExtraInfo.getSupplierDyeingPlant());
-				 fabricItem.setSupplierCodePrintingPlant(findExtraInfo.getSupplierCodePrintingPlant());
-				 fabricItem.setSupplierCodeDyeingPlant(findExtraInfo.getSupplierCodeDyeingPlant());
+//				 fabricItem.setSupplierPrintingPlant(findExtraInfo.getSupplierPrintingPlant());
+//				 fabricItem.setSupplierDyeingPlant(findExtraInfo.getSupplierDyeingPlant());
+//				 fabricItem.setSupplierCodePrintingPlant(findExtraInfo.getSupplierCodePrintingPlant());
+//				 fabricItem.setSupplierCodeDyeingPlant(findExtraInfo.getSupplierCodeDyeingPlant());
+
+				 if(!(item.getInventoryCcode()!=null&&item.getInventoryCcode().substring(0,2).equals("04")
+						 &&!item.getInventoryCcode().equals("0499"))){
+					 fabricItem.setSupplierCodeDyeingPlant(null);//染厂编码
+					 fabricItem.setSupplierDyeingPlant(null);//染厂
+					 fabricItem.setSupplierCodePrintingPlant(null);//印厂编码
+					 fabricItem.setSupplierPrintingPlant(null);//印厂
+				 }
 				 fabricItem.setRemainingQuantity(findExtraInfo.getRemainingQuantity());
 				 fabricItem.setOrderNumber(findExtraInfo.getOrderNumber());
 				 fabricItem.setElementsId(findExtraInfo.getElementsId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -174,7 +174,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		syPackingListFabric.setDelFlag("0");
 		syPackingListFabric.setStatus("0");
 		syPackingListFabric.setDocumentNo(dateNo);//单据号
-		syPackingListFabric.setDataSource("参照出运明细");//参照
+		syPackingListFabric.setDataSource("参照出运明细");//参照 supplier
 		String username="admin";
 		if (oConvertUtils.isNotEmpty(token)){
 			username = getUsername(token);
@@ -862,8 +862,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					}
 					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().substring(0,2).equals("03")
 							&&!item.getInventoryCcode().equals("0399")){
-						s1.setSupplierCodeDyeingPlant(item.getSupplierCode());//染厂编码
-						s1.setSupplierDyeingPlant(item.getSupplier());//染厂
+//						s1.setSupplierCodeDyeingPlant(item.getSupplierCode());//染厂编码
+//						s1.setSupplierDyeingPlant(item.getSupplier());//染厂
 					}
 					s1.setSpecificationAndModel(item.getSpecificationAndModel());//规格型号
 
@@ -1033,8 +1033,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					}
 					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().substring(0,2).equals("03")
 							&&!item.getInventoryCcode().equals("0399")){//染厂
-						item.setSupplierCodeDyeingPlant(syShippingDetailsItem.getSupplierCode());//染厂编码
-						item.setSupplierDyeingPlant(syShippingDetailsItem.getSupplier());//染厂供应商
+//						item.setSupplierCodeDyeingPlant(syShippingDetailsItem.getSupplierCode());//染厂编码
+//						item.setSupplierDyeingPlant(syShippingDetailsItem.getSupplier());//染厂供应商
 
 					}
 					if(item.getActualDeclaredQuantity()!=null){//计算超发和剩余数量
@@ -2530,8 +2530,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							if(syShippingDetailsItem.getInventoryCcode()!=null&&syShippingDetailsItem.getInventoryCcode().substring(0,2).equals("03")
 									&&!syShippingDetailsItem.getInventoryCcode().equals("0399")){
 								//满足条件
-								sy1.setSupplierCodeDyeingPlant(syShippingDetailsItem.getSupplierCode());//染厂编码
-								sy1.setSupplierDyeingPlant(syShippingDetailsItem.getSupplier());//染厂
+//								sy1.setSupplierCodeDyeingPlant(syShippingDetailsItem.getSupplierCode());//染厂编码
+//								sy1.setSupplierDyeingPlant(syShippingDetailsItem.getSupplier());//染厂
 							}
 							sy1.setElementsId(elementsId);//申报要素id
 							sy1.setOmpoAccount(syShippingDetailsItem.getOmpoAccount());//委外采购账套号
@@ -3471,7 +3471,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			syPackingListFabric.setDelFlag("0");
 			syPackingListFabric.setStatus("0");
 			syPackingListFabric.setDocumentNo(dateNo);//单据号
-			syPackingListFabric.setDataSource("参照出运明细");//参照
+			syPackingListFabric.setDataSource("参照出运明细");//参照 supplier
 //			String username = "admin";
 //			if (oConvertUtils.isNotEmpty(token)) {
 //				username = getUsername(token);