推送调整

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

@@ -999,12 +999,9 @@ public class SyPackingListFabricController {
 					 return result;
 				 }
 			 }
-			 QueryWrapper queryWrapper=new QueryWrapper();
-			 queryWrapper.eq("sy_Packing_List_Fabric_Id",ids);
-			 queryWrapper.eq("del_flag","0");
-			 List<SyPackingListFabricItem> items=syPackingListFabricItemService.list(queryWrapper);
+			 List<SyPackingListFabricItem> items=syPackingListFabricItemService.selectByMainId3(ids);
 			 String message="";//获取报错消息
-			 String account="";//当前账套
+			 String account="";//当前账套 
 			 if(items!=null){
 
 				 //SyOrderData syOrderData=syOrderDataMapper.selectById(items.get(0).getSyOrderDataId());//最终客户
@@ -1057,10 +1054,14 @@ public class SyPackingListFabricController {
 				 main.setPushState("2");//推送失败！
 				 result.setSuccess(false);
 				 result.setMessage(message);
-			 }else{
+			 }else if(message.indexOf("成功")>-1) {
 				 main.setPushState("1");//推送成功！
 				 result.setSuccess(true);
 				 result.setMessage(message);
+			 }else{
+				 main.setPushState("2");//推送失败！
+				 result.setSuccess(false);
+				 result.setMessage(message);
 			 }
 			 result.setResult(main);
 			 syPackingListFabricService.updateById(main);//修改成衣

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.splfi.service;
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
@@ -13,4 +14,6 @@ import java.util.List;
 public interface ISyPackingListFabricItemService extends IService<SyPackingListFabricItem> {
 
 	public List<SyPackingListFabricItem> selectByMainId(String mainId);
+
+	public List<SyPackingListFabricItem> selectByMainId3(String... toArray);
 }

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

@@ -24,4 +24,9 @@ public class SyPackingListFabricItemServiceImpl extends ServiceImpl<SyPackingLis
 	public List<SyPackingListFabricItem> selectByMainId(String mainId) {
 		return syPackingListFabricItemMapper.selectByMainId(mainId);
 	}
+
+	@Override
+	public List<SyPackingListFabricItem> selectByMainId3(String... toArray) {
+		return syPackingListFabricItemMapper.selectByMainId3(toArray);
+	}
 }

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

@@ -1106,6 +1106,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				map5.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码（如果传空，取来源单据）
 				map5.put("CEXCH_NAME",orderData.get("cexchname"));//CEXCH_NAME 币种名称
 				map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
+				map.put("IEXCHRATE",orderData.get("nflat"));//汇率
+				map.put("CEXCH_NAME",orderData.get("cexchname"));//CEXCH_NAME 币种名称
 				//SYF128-森诺
 				if(!orderData.get("cexchname").equals("人民币")){//不为人民币
 					SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
@@ -1229,6 +1231,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							mapItem7.put("CINVCODE",mapStr1.get("cInvCode"));//存货编码（如果来源单据是委外订单，此字段需要传该订单的子件编码）
 							mapItem7.put("IQUANTITY",mapStr1.get("iQuantity"));//数量
 							mapItem7.put("CBATCH",item.getDyelotNumber());//批号
+							mapItem7.put("CDEFINE26",item.getKaoClothWeight());
 							mapItems7.add(mapItem7);
 						}
 						String cSOCode=syPackingListFabricMapper.getSO_SOMain(mapStr1.get("isosid").toString());
@@ -1255,6 +1258,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					/*mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
 					mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额*/
 				}
+				if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("04")>-1
+						&&!item.getInventoryCcode().equals("0499")){
+					mapItem.put("CDEFINE26",item.getAfterHeavy());
+				}else{
+					mapItem.put("CDEFINE26",item.getKaoClothWeight());
+				}
 				if(!mapt.get("CVENCODE").equals("one")){//查询供应商表获取编码 	顺序---3
 					if(!mapt.containsKey("CWHCODE")){
 						String wheCode=syPackingListTailoringMapper.getWhCodeByVenCode(mapt.get("CVENCODE").toString());
@@ -1268,6 +1277,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				mapt.put("poid","one");//重置销售订单id
 				mapItem5.put("CDEFINE23",item.getDeclarationUnit());//报关单位
 				mapItem5.put("CDEFINE33",item.getDeclarationName());//报关品名
+				mapItem6.put("CDEFINE31",item.getDeclarationUnit());//货物名称
+				mapItem6.put("CDEFINE23",item.getDeclarationName());//报关单位
+
 
 				//if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据  顺序---5
 				if(orderDataItem!=null&&orderDataItem.containsKey("iSOsID")&&orderDataItem.get("iSOsID")!=null){

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

@@ -1366,10 +1366,14 @@ public class SyPackingListTailoringController {
 				main.setPushState("2");//推送失败！
 				result.setSuccess(false);
 				result.setMessage(message);
-			}else{
+			}else if(message.indexOf("成功")>-1){
 				main.setPushState("1");//推送成功！
 				result.setSuccess(true);
 				result.setMessage(message);
+			}else{
+				main.setPushState("2");//推送失败！
+				result.setSuccess(false);
+				result.setMessage(message);
 			}
 			//result.setResult(main);
 			syPackingListTailoringService.updateById(main);//修改成衣

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

@@ -913,6 +913,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				map5.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码（如果传空，取来源单据）
 				map5.put("CEXCH_NAME",orderData.get("cexchname"));//CEXCH_NAME 币种名称
 				map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
+				map.put("IEXCHRATE",orderData.get("nflat"));//汇率
+				map.put("CEXCH_NAME",orderData.get("cexchname"));//CEXCH_NAME 币种名称
 				//SYF128-森诺
 				if(!orderData.get("cexchname").equals("人民币")){//不为人民币
 					SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");