成衣增加字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -59,6 +59,9 @@
 			ompo_Id_Item,/*委外采购子表Id*/
 			ymoney,/*佣金*/
 			inventory_name,
+			total_Pack,
+			pack_Box,
+			packs,
 			inventory_code,
 			spur_or_sub_order,
 			factory_unit_price,
@@ -361,6 +364,9 @@
 			b.inventory_name,
 			b.inventory_code,
 			b.spur_or_sub_order,
+			b.total_Pack,
+			b.pack_Box,
+			b.packs,
 			b.factory_unit_price,
 			b.master_Metering,
 			b.group_id,

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

@@ -167,8 +167,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		syPackingListFabric.setStatus("0");
 		syPackingListFabric.setDocumentNo(dateNo);//单据号
 		syPackingListFabric.setDataSource("参照出运明细");//参照
-		syPackingListFabric.setPreparedBy(getUsername(token));//将admin设置为制单人
-		syPackingListFabric.setCreateBy(getUsername(token));//将admin设置为制单人
+		String username=getUsername(token);
+		syPackingListFabric.setPreparedBy(username);//将admin设置为制单人
+		syPackingListFabric.setCreateBy(username);//将admin设置为制单人
+		if(username!=null&&username.equals("周泽济")){
+			syPackingListFabric.setPushState("4");
+		}
 		syPackingListFabricMapper.insert(syPackingListFabric);
 		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
 		BigDecimal total=new BigDecimal("0");//合计数量，初始为0
@@ -884,8 +888,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				num++;
 				syPackingListFabric.setStatus("0");//状态
 				syPackingListFabric.setDataSource("excel导入");//excel导入
-				syPackingListFabric.setPreparedBy(getUsername(token));//将admin设置为制单人
-				syPackingListFabric.setCreateBy(getUsername(token));//将admin设置为制单人
+				String username=getUsername(token);
+				syPackingListFabric.setPreparedBy(username);//将admin设置为制单人
+				syPackingListFabric.setCreateBy(username);//将admin设置为制单人
+				if(username!=null&&username.equals("周泽济")){
+					syPackingListFabric.setPushState("4");
+				}
 				//syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis())));
 				syPackingListFabric.setDelFlag("0");//是否删除
 				syPackingListFabricMapper.insert(syPackingListFabric);
@@ -1406,7 +1414,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(关联单据类型为采购订单传ID，为采购到货单为Autoid，为委外订单传MODetailsID，为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
 					mapItem.put("CBATCHPROPERTY3",item.getRolls());
-					mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID（采购订单行ID/委外订单行ID）
+					//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID（采购订单行ID/委外订单行ID）
 					//map5.put("CGLTYPE","委外订单");
 					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("040")>-1&&mapt.get("account").equals("103")&&!moDetailsIds.contains(item.getOmpoIdItem())){//103账套中物料分类为040的印花面料
 						List<Map<String,Object>> orderDataItem3 =syPackingListFabricMapper.getOM_MOMaterials(item.getOmpoIdItem(),item.getInventoryCode());//委外订单子表
@@ -2110,6 +2118,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						continue;
 					}
 					sy.setDataSource("u8拉取");//直接从u8拉取的数据
+					sy.setPushState("4");
 					sy.setId(oConvertUtils.getId());
 					sy.setU8Id(account + sy.getU8Id());
 					//sy.setId(sy.getU8Id());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -186,6 +186,9 @@
 		ymoney,/*佣金*/
 		plan_Size,/*计划尺码数量*/
 		remarks,/*备注*/
+		total_Pack,
+		pack_Box,
+		packs,
 		group_id
 	FROM  sy_packing_list_tailoring_item
 	WHERE sy_packing_list_tailoring_id =#{value} AND del_flag = 0

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -1285,7 +1285,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					getcFree(mapItem6,orderDataItem2);
 					mapItem.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(关联单据类型为采购订单传ID，为采购到货单为Autoid，为委外订单传MODetailsID，为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
-					mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID（采购订单行ID/委外订单行ID）
+					//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID（采购订单行ID/委外订单行ID）
 					map5.put("CGLTYPE","入库单");
 					mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
 					//mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）