装箱单辅料

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

@@ -172,8 +172,8 @@ public class SyPackingListFabricController {
 			return result;
 		}
 		//public Result<SyPackingListFabric>  getSyShippingDetailsData(String[] ids,String[] groupIds)
-		 System.out.println("数组长度"+ids.length);
-		 System.out.println("分组id长度"+groupIds.length);
+		// System.out.println("数组长度"+ids.length);
+		// System.out.println("分组id长度"+groupIds.length);
 		SyPackingListFabric syPackingListFabric=syPackingListFabricService.getSyShippingDetailsData(ids,groupIds);
 		//syPackingListFabric.setPreparedBy(JwtUtil.getUsername(token));
 		 syPackingListFabric.setPreparedBy("admin");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -309,6 +309,13 @@ public class SyPackingListFabricItem implements Serializable {
 	//@TableField(exist = false)
 	private String isosid;
 
+	@Excel(name = "最底层供应商编码", width = 15)
+	@ApiModelProperty(value = "最底层供应商编码")
+	private java.lang.String supplierCode;
+
+	@Excel(name = "最底层供应商名称", width = 15)
+	@ApiModelProperty(value = "最底层供应商名称")
+	private java.lang.String supplier;
 
 	@TableField(exist = false)
 	private String venId;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -64,8 +64,10 @@
 			AND inventory_Ccode!='0499' AND sy_shipping_details_item.id=b.id) supplierPrintingPlant,
 			(SELECT supplier_code FROM sy_shipping_details_item WHERE inventory_Ccode LIKE '04%'
 			AND inventory_Ccode!='0499' AND sy_shipping_details_item.id=b.id) supplierCodePrintingPlant,
-
+			b.account,/*账套号*/
 			b.inventory_CCode venId,/*获取物料分类*/
+			b.supplier_code,/*获取供应商编码*/
+			b.supplier,/*获取供应商*/
 			a.order_Type,
 			(select declaration_Name from sy_declaration_elements where id=b.elements_Id) as declaration_Name,
 			IF(INSTR(b.order_number,'-')>0,LEFT(b.order_number,INSTR(b.order_number,'-')-1),b.order_number) PlanLotNumber,

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

@@ -172,7 +172,33 @@ return null;
 		//syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));//获取制单日期
 		//System.out.println("ids的数据为:\t"+ids[0]+"\ngroupIds为:\t"+groupIds[0]);
 		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids,groupIds);
-
+		/*for (SyPackingListFabricItem syPackingListFabricItem : syPackingListFabricItems){
+			if(syPackingListFabricItem.getVenId().indexOf("04")>-1&&!syPackingListFabricItem.getVenId().equals("0499")){
+				//满足条件
+				String sql="";
+				List<Map<String, Object>> list=null;
+				switch (syPackingListFabricItem.getAccount()){
+					case "901":
+						list=senYuDataSourceOne.queryForList(sql);
+						break;
+					case "902":
+						list=senYuDataSourceTwo.queryForList(sql);
+						break;
+					case "903":
+						list=senYuDataSourceThree.queryForList(sql);
+						break;
+				}
+				if(list==null){
+					continue;
+				}
+				List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
+				for (JSONObject json1 :  jianSon){
+					SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
+					syPackingListFabricItem.setSupplierCodeDyeingPlant(sy1.getSupplierCodeDyeingPlant());//染厂供应商编码
+					syPackingListFabricItem.setSupplierDyeingPlant(sy1.getSupplierDyeingPlant());//染厂供应商
+				}
+			}
+		}*/
 		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItems);
 
 		return syPackingListFabric;
@@ -215,6 +241,8 @@ return null;
 						account+" as account , \n" +
 						"'1' as is_U8_Data,\n" +
 						"a.cMemo memo,\n" +
+						"0 as delflag,\n" +
+						"0 as status,\n" +
 						"a.cMaker preparedBy,\n" +
 						"a.cDefine10  exportInvoiceNo,\n" +
 						"a.dnmaketime  preparedDate\n" +
@@ -229,8 +257,8 @@ return null;
 						"and cInvCCode not like '02%'\n" +
 						"and cInvCCode not like '03%'\n" +
 						"and cInvCCode not like '04%'\n" +
-						"and cInvCCode not like '19%')>0"+
-						"and a.dnverifytime>'"+lastTime+"'";//根据最后一次拉去时间
+						"and cInvCCode not like '19%'\n" +
+						" )>0 and a.dnverifytime>'"+lastTime+"'";//根据最后一次拉去时间
 				List<Map<String, Object>> listMain = new ArrayList<>();
 				System.out.println("sql：\t"+sql);
 				if(account.equals("903")){
@@ -259,6 +287,7 @@ return null;
 							"left(b.csocode,ISNULL(NULLIF(CHARINDEX('-',b.csocode)-1,-1),len(b.csocode))) as planLotNumber,\n" +
 							"b.csocode as orderNumber,\n" +
 							account+" as account,\n"+
+							"0  as delflag,\n" +
 							"f.AutoID  as isosid,\n" +
 							"b.iQuantity  as inventoryQuantity,\n" +
 							"b.cbMemo as remarks,\n" +
@@ -295,7 +324,7 @@ return null;
 							"and cCusCode='T020001'\n" +
 							"and a.id='"+sy.getU8Id().substring(3)+"'";
 					List<Map<String, Object>> list = new ArrayList<>();
-					String groupId=oConvertUtils.getId();//获取id
+					//String groupId=oConvertUtils.getId();//获取id
 					if(account.equals("903")){
 						list = senYuDataSourceThree.queryForList(sql2);//903
 					}else{
@@ -306,8 +335,9 @@ return null;
 						SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
 						sy1.setU8Id(account+sy1.getU8Id());//获取账套号+id
 						sy1.setId(sy1.getU8Id());
+						sy1.setIsosid(sy1.getAccount()+sy1.getIsosid());//账套号+销售订单id
 						sy1.setActualDeclaredQuantity(sy1.getInventoryQuantity());//给报关数量赋值
-						sy1.setGroupId(groupId);
+						sy1.setGroupId(sy1.getOrderNumber()+"-"+sy1.getInventoryCode()+"-"+sy1.getSize());
 						sy1.setSyPackingListFabricId(sy.getId());//获取主表id
 						sy1.setU8Pid(sy.getU8Id());
 						syPackingListFabricItemMapper.insert(sy1);//插入新数据

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -303,6 +303,11 @@ public class SyPackingListTailoringController {
 			 result.setSuccess(false);
 			 return result;
 		 }
+		 /*if(syPackingListTailoring.getIsReference().equals("1")){
+			 result.setMessage("已被下游参照不能直接取消提交");
+			 result.setSuccess(false);
+			 return result;
+		 }*/
 		 syPackingListTailoring.setStatus("0");//修改为已保存
 		 syPackingListTailoringService.updateById(syPackingListTailoring);
 		 return result;