推送调整

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

@@ -1216,26 +1216,30 @@ public class SyPackingListFabricController {
 				 result.setMessage("请至少选中一条数据");
 				 return result;
 			 }
+			 String message2="";
 			 Map<String,Object> map=new HashMap<>();
 			 SyPackingListFabric main=syPackingListFabricService.getById(ids);
 			 if(main.getIsReference()==0){
 				 result.setSuccess(false);
 				 result.setMessage("请先做托书再推送");
-				 return result;
+				 message2="请先做托书再推送";
+				 //return result;
 			 }
 			 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(ids);
 			 if(mapdate!=null){
 				 if(!mapdate.containsKey("e4")||mapdate.get("e4").equals("0")){
 					 result.setSuccess(false);
 					 result.setMessage("请先提交托书再推送");
-					 return result;
+					 message2="请先提交托书再推送";
+					 //return result;
 				 }
 				 if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null){
 					 main.setTheFinalShippingDate(mapdate.get("e1").toString());
 				 }else{
 					 result.setSuccess(false);
 					 result.setMessage("请先维护最终船期再推送");
-					 return result;
+					 message2="请先维护最终船期再推送";
+					 //return result;
 				 }
 				 if(mapdate.containsKey("e2")&&mapdate.get("e2")!=null){
 					 main.setTheFinalShippingDate2(mapdate.get("e2").toString());
@@ -1245,18 +1249,41 @@ public class SyPackingListFabricController {
 				 }else{
 					 result.setSuccess(false);
 					 result.setMessage("请先维护装运期限再推送");
-					 return result;
+					 message2="请先维护装运期限再推送";
+					 //return result;
 				 }
 			 }
 			 if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
 				 result.setSuccess(false);
 				 result.setMessage("数据在推送中，请不要重复点击");
+				 //message2="数据在推送中，请不要重复点击";
 				 return result;
 			 }else{
 				 main.setRecordingStatus(1);
 				 syPackingListFabricService.updateById(main);//修改成衣
 			 }
 			 List<SyPackingListFabricItem> items=syPackingListFabricItemService.selectByMainId3(ids);
+			 Map<String,String> supperNames=new HashMap<>();
+			 for (SyPackingListFabricItem syPackingListFabricItem : items){
+			 	if(supperNames.containsKey(syPackingListFabricItem.getSupplier())){
+					supperNames.put(syPackingListFabricItem.getSupplier(),syPackingListFabricItem.getSupplier());
+				}else{
+					supperNames.put(syPackingListFabricItem.getSupplier(),syPackingListFabricItem.getSupplier());
+				}
+			 	if(supperNames.size()>1){
+					result.setSuccess(false);
+					result.setMessage("供应商不一样，不能推送");
+					message2="供应商不一样，不能推送";
+				}
+			 }
+			 if(message2.length()>1){
+				 main.setRecordingError(message2);//报错原因
+				 main.setPushState("2");//推送失败
+				 main.setRecordingStatus(0);//改成未推送
+				 syPackingListFabricService.updateById(main);
+				 return result;
+			 }
+
 			 String message="";//获取报错消息
 			 String account="";//当前账套 
 			 if(items!=null){
@@ -1265,12 +1292,10 @@ public class SyPackingListFabricController {
 				 SyOrderData syOrderData=syOrderDataMapper.selectById(items.get(0).getSyOrderDataId());//最终客户
 				 if(syOrderData!=null){
 					 main.setEndCustomer(syOrderData.getEndCustomer());
-					 System.out.println("最终客户\t"+syOrderData.getEndCustomer());
 				 }
 				 SyOrderDataItem syOrderDataItem=syOrderDataItemMapper.selectById(items.get(0).getSyOrderDataItemId());//供应商全称
 				 if(syOrderDataItem!=null){
 					 main.setSupplierCode(syOrderDataItem.getSupplierCode());
-					 System.out.println("客户编码\t"+syOrderDataItem.getSupplierCode());
 				 }
 
 				 String venCode=syPackingListTailoringService.getDictValue(main.getGarmentFactory());//根据成衣工厂获取仓库编码

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

@@ -1192,7 +1192,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map5.put("CHANDLER",createBy);//审核人
 
 			JSONObject map6=new JSONObject();//销售发票
-			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch","cSBVCode")));//发票号
+			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode")));//发票号
 			map6.put("DDATE",createDate);//发票日期（yyyy-MM-dd）
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称
@@ -1421,7 +1421,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							mapItem7.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(固定MOMaterialsID) MOMaterialsID
 							mapItem7.put("AUTOID_PO",mapStr1.get("MODetailsID"));//关联明细ID
 							mapItem7.put("CINVCODE",mapStr1.get("cInvCode"));//存货编码（如果来源单据是委外订单，此字段需要传该订单的子件编码）
-							mapItem7.put("IQUANTITY",mapStr1.get("iQuantity"));//数量
+							mapItem7.put("IQUANTITY",item.getAfterHeavy());//数量
 							mapItem7.put("CBATCH",item.getDyelotNumber());//批号
 							mapItem7.put("CDEFINE26",item.getKaoClothWeight());
 							mapItems7.add(mapItem7);
@@ -1473,8 +1473,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem6.put("CWHCODE",mapt.get("vencode"));//仓库编码
 				}
 				mapt.put("poid","one");//重置销售订单id
-				mapItem5.put("CDEFINE23",item.getDeclarationUnit());//报关单位
-				mapItem6.put("CDEFINE23",item.getDeclarationUnit());//报关单位
+				mapItem5.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()) );//报关单位
+				mapItem6.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()) );//报关单位
 				mapItem5.put("CDEFINE33",item.getDeclarationName());//报关品名
 				mapItem6.put("CDEFINE31",item.getDeclarationName());//货物名称
 
@@ -1635,21 +1635,25 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			text(mapList7,"印厂采购入库单");
 		}
 		String isSucceed=null;
-		if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null&&main.getIsSucceed().indexOf("-7-")>0){//印花
-			JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
-			isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
-			isSucceed(main,isSucceed);
-			//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
-		}else if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()==null){
-			JSONArray resturn7 = InterfaceConnUtils.doPost(mapList7,"purchasein_import");//采购入库单
-			isSucceed=result(main,resturn7,"印厂采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"7");//采购入库单
-			isSucceed(main,isSucceed);
-			this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn7.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
-
-			JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
-			isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
-			isSucceed(main,isSucceed);
-			//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
+		try{
+			if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null&&main.getIsSucceed().indexOf("-7-")>0){//印花
+				JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
+				isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
+				isSucceed(main,isSucceed);
+				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
+			}else if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()==null){
+				JSONArray resturn7 = InterfaceConnUtils.doPost(mapList7,"purchasein_import");//采购入库单
+				isSucceed=result(main,resturn7,"印厂采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"7");//采购入库单
+				isSucceed(main,isSucceed);
+				this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn7.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
+
+				JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
+				isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
+				isSucceed(main,isSucceed);
+				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
+			}
+		}catch (Exception e){
+			e.printStackTrace();
 		}
 		String recording=null;
 		if(main.getRecording()!=null){
@@ -1729,7 +1733,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						maps.get(account).put("code",resturn4.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 					case "4":
-						String saleoutName=maps.get(account).get("code");//销售出库单
+						String saleoutName=maps.get(account).get("code");//销售发票单
 						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(saleoutName),"131");
 						List<Map<String,Object>> saleoutMaps= syPackingListTailoringMapper.getRdrecord32(saleoutName);
 						if(saleoutMaps!=null){
@@ -1823,7 +1827,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		JSONObject jsonObject4=resturn4.getJSONObject(0);//销售出库单
 		String saleoutName=jsonObject4.get("U8ReceiptNo").toString();//销售出库单
 
-		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(saleoutName),"131");
+	//	this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(saleoutName),"131");
 
 		List<Map<String,Object>> saleoutMaps= syPackingListTailoringMapper.getRdrecord32(saleoutName);
 		if(saleoutMaps!=null){

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

@@ -42,4 +42,5 @@ public interface SyPackingListTailoringItemMapper extends BaseMapper<SyPackingLi
 
 	@InterceptorIgnore(tenantLine = "true")
 	public Integer insertBatch(@Param("list") List<SyPackingListTailoringItem> item);
+
 }

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

@@ -66,6 +66,8 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
 
     public String getCvenName(String cvencode);
 
+    public String getUnit(String cinvCode);
+
     //获取目标行号   参数当前数据库,目标数据库，销售订单号，目标账套号,行号
     public String getIvouchrowno(@Param("params1") String params1,@Param("params2") String params2,@Param("params3") String params3
             ,@Param("params4") String params4,@Param("params5") String params5);

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

@@ -314,4 +314,9 @@
         where cVenCode=#{value }
     </select>
 
+    <select id="getUnit" parameterType="java.lang.String" resultType="java.lang.String">
+        select cInvDefine2 from Inventory
+        where cInvCode=#{value }
+    </select>
+
 </mapper>

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

@@ -1317,7 +1317,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}
 				//}
 
-				mapItem5.put("CDEFINE23",item.getDeclarationUnit());//报关单位
+				item.getInventoryCode();
+
+				mapItem5.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()) );//报关单位
 				mapItem5.put("CDEFINE33",item.getDeclarationName());//报关品名
 				if(!mapt.get("poid").equals("one")){//销售订单
 					Map<String,Object> order=syPackingListTailoringMapper.getSoMain(mapt.get("poid").toString());//