辅料关联出运明细 面料获取染厂印厂数据

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

@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
+import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElements;
+import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElementsItem;
+import org.jeecg.modules.documents.seclarationElements.mapper.SyDeclarationElementsItemMapper;
+import org.jeecg.modules.documents.seclarationElements.mapper.SyDeclarationElementsMapper;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.documents.shippingDetails.mapper.SyShippingDetailsItemMapper;
@@ -51,6 +55,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Autowired
 	private SyShippingDetailsItemMapper syShippingDetailsItemMapper;
 	@Autowired
+	private SyDeclarationElementsMapper syDeclarationElementsMapper;
+	@Autowired
 	private ISenYuDataSourceOne senYuDataSourceOne;
 	@Autowired
 	private ISenYuDataSourceTwo senYuDataSourceTwo;
@@ -70,6 +76,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		syPackingListFabric.setDelFlag("0");
 		syPackingListFabric.setStatus("0");
 		syPackingListFabric.setDocumentNo(dateNo);//单据号
+		syPackingListFabric.setPreparedBy("admin");//将admin设置为制单人
 		syPackingListFabricMapper.insert(syPackingListFabric);
 		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
 		BigDecimal total=new BigDecimal("0");//合计数量，初始为0
@@ -172,33 +179,14 @@ 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){
+		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());//染厂供应商
-				}
+				SyShippingDetailsItem syShippingDetailsItem=syShippingDetailsItemMapper.selectById(syPackingListFabricItem.getSyShippingDetailsItemId());//获取出运明细子表数据
+				syPackingListFabricItem.setSupplierCodeDyeingPlant(syShippingDetailsItem.getRSupplierCode());//染厂编码
+				syPackingListFabricItem.setSupplierDyeingPlant(syShippingDetailsItem.getRSupplier());//染厂
 			}
-		}*/
+		}
 		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItems);
 
 		return syPackingListFabric;
@@ -236,7 +224,7 @@ return null;
 			for (String pk : pks){
 				String account=pk.split(":")[1];//获取账套号
 				//先插主表数据，然后根据主表id查询子表数据再添加
-				String sql="select \n" +
+				String sql="select top 10 \n" +
 						"a.id u8Id,\n" +
 						account+" as account , \n" +
 						"'1' as is_U8_Data,\n" +
@@ -280,6 +268,7 @@ return null;
 					sy.setDocumentNo(dateNo);//单据号
 					sy.setU8Id(account+sy.getU8Id());
 					sy.setId(sy.getU8Id());
+					String pname="";
 					syPackingListFabricMapper.insert(sy);//添加数据
 					String sql2="select " +
 							"b.AutoID as u8id ,\n" +
@@ -340,9 +329,35 @@ return null;
 						sy1.setGroupId(sy1.getOrderNumber()+"-"+sy1.getInventoryCode()+"-"+sy1.getSize());
 						sy1.setSyPackingListFabricId(sy.getId());//获取主表id
 						sy1.setU8Pid(sy.getU8Id());
+						QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
+						queryWrapper2.eq("sy_order_data_item_id",sy1.getIsosid());
+						queryWrapper2.last("limit 1");
+						SyShippingDetailsItem syShippingDetailsItem=syShippingDetailsItemMapper.selectOne(queryWrapper2);
+						if(syShippingDetailsItem!=null){
+							pname=syShippingDetailsItem.getGarmentFactory();//成衣工厂
+							String elementsId=syShippingDetailsItem.getElementsId();//申报要素id
+							if(oConvertUtils.isNotEmpty(elementsId)){
+								SyDeclarationElements syDeclarationElements=syDeclarationElementsMapper.selectById(elementsId);
+								if(syDeclarationElements!=null){
+									sy1.setDeclarationName(syDeclarationElements.getDeclarationName());//获取报关品名
+								}
+							}
+							sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商编码
+							sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商
+							sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
+							sy1.setSupplierCode(syShippingDetailsItem.getSupplierCode());//供应商
+							sy1.setSyShippingDetailsId(syShippingDetailsItem.getShippingDetailsId());//出运明细主表id
+							sy1.setSyShippingDetailsItemId(syShippingDetailsItem.getId());//出运明细子表id
+							sy1.setManualYarnUnitPrice(syShippingDetailsItem.getManualYarnUnitPrice());//手册纱单价
+							sy1.setManualYarnFlag(syShippingDetailsItem.getManualYarnFlag());//是否手册纱
+							sy1.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比
+						}
 						syPackingListFabricItemMapper.insert(sy1);//插入新数据
 					}
-					//sys.add(sy);//集合
+					if(oConvertUtils.isNotEmpty(pname)){//不为空就进行添加修改
+						sy.setGarmentFactory(pname);//成衣工厂
+						syPackingListFabricMapper.updateById(sy);//添加成衣工厂
+					}
 				}
 			}
 			dxpDataPlanService.updateLastTime2(time,"senYu_accessory_data");//修改最后抓取时间