推送调整

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

@@ -48,8 +48,10 @@ import org.jeecg.modules.splt.entity.SyPackingListTailoring;
 import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
 import org.jeecg.modules.splt.service.ISyPackingListTailoringService;
 import org.jeecg.modules.system.controller.CommonController;
+import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.service.ISysDictItemService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -1138,6 +1140,10 @@ public class SyPackingListFabricController {
 
 					 main.setSyPackingListFabricItem(items);
 					 map.put("account",items.get(0).getOmpoAccount());//委外采购账套号
+					 String venCode=syPackingListTailoringService.getDictValue(main.getGarmentFactory());//根据成衣工厂获取仓库编码
+					 if(venCode!=null){
+						 map.put("vencode",venCode);//委外采购账套号
+					 }
 					 map.put("account1",items.get(0).getOmpoAccount());//委外采购账套号
 					 map.put("ompoId",items.get(0).getOmpoId());//采购委外主表id
 					 map.put("mpOrder",items.get(0).getPurOrSubOrder());//采购委外订单号
@@ -1179,7 +1185,7 @@ public class SyPackingListFabricController {
 				 }else if(message.indexOf("成功")>-1) {
 					 main.setPushState("1");//推送成功！
 					 result.setSuccess(true);
-					 main.setRecordingError(null);
+					 main.setRecordingError("");
 					 result.setMessage(message);
 				 }else{
 					 main.setPushState("2");//推送失败！
@@ -1267,6 +1273,10 @@ public class SyPackingListFabricController {
 					 System.out.println("客户编码\t"+syOrderDataItem.getSupplierCode());
 				 }
 
+				 String venCode=syPackingListTailoringService.getDictValue(main.getGarmentFactory());//根据成衣工厂获取仓库编码
+				 if(venCode!=null){
+					 map.put("vencode",venCode);//委外采购账套号
+				 }
 				 main.setSyPackingListFabricItem(items);
 				 map.put("account",items.get(0).getOmpoAccount());//委外采购账套号
 				 map.put("account1",items.get(0).getOmpoAccount());//委外采购账套号
@@ -1309,7 +1319,7 @@ public class SyPackingListFabricController {
 			 }else if(message.indexOf("成功")>-1) {
 				 main.setPushState("1");//推送成功！
 				 result.setSuccess(true);
-				 main.setRecordingError(null);
+				 main.setRecordingError("");
 				 result.setMessage(message);
 			 }else{
 				 main.setPushState("2");//推送失败！

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

@@ -1249,7 +1249,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			}
 
 			if(mapt.get("account").equals("101")){
-				map5.put("CDEFINE4",main.getLatestDateOfShipment2());//最终船期
+				map5.put("CDEFINE4",main.getLatestDateOfShipment2().substring(0,10));//装柜日期
 			}
 
 			if(mapt.get("account").equals("103")){//查询委外订单主表数据	顺序---1
@@ -1463,6 +1463,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem3.put("CWHCODE",mapt.get("CWHCODE"));//仓库编码	这个是子表需要字段
 					mapItem6.put("CWHCODE",mapt.get("CWHCODE"));//仓库编码
 				}
+				if(map.get("account").equals("101")&&map.containsKey("vencode")){
+					map.put("CWHCODE",map.get("vencode"));//仓库编码
+					map4.put("CWHCODE",map.get("vencode"));//仓库编码
+					mapItem3.put("CWHCODE",map.get("vencode"));//仓库编码	这个是子表需要字段
+					mapItem6.put("CWHCODE",map.get("vencode"));//仓库编码
+				}
 				mapt.put("poid","one");//重置销售订单id
 				mapItem5.put("CDEFINE23",item.getDeclarationUnit());//报关单位
 				mapItem6.put("CDEFINE23",item.getDeclarationUnit());//报关单位

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

@@ -1397,6 +1397,10 @@ public class SyPackingListTailoringController {
 					 }else{
 						 map.put("mpOrder",main.getPurchase());//采购委外订单号
 					 }
+					 String venCode=syPackingListTailoringService.getDictValue(main.getGarmentFactory());//根据成衣工厂获取仓库编码
+					 if(venCode!=null){
+						 map.put("vencode",venCode);//委外采购账套号
+					 }
 					 map.put("customerCode","one");//客户编码
 					 map.put("CVENCODE","one");//供应商编码
 					 map.put("orderNumber","one");//销售订单号
@@ -1426,7 +1430,7 @@ public class SyPackingListTailoringController {
 					 result.setMessage(message);
 				 }else if(message.indexOf("成功")>-1){
 					 main.setPushState("1");//推送成功！
-					 main.setRecordingError(null);
+					 main.setRecordingError("");
 					 result.setSuccess(true);
 					 result.setMessage(message);
 				 }else{
@@ -1536,6 +1540,10 @@ public class SyPackingListTailoringController {
 				}else{
 					map.put("mpOrder",main.getPurchase());//采购委外订单号
 				}
+				String venCode=syPackingListTailoringService.getDictValue(main.getGarmentFactory());//根据成衣工厂获取仓库编码
+				if(venCode!=null){
+					map.put("vencode",venCode);//委外采购账套号
+				}
 				map.put("customerCode","one");//客户编码
 				map.put("CVENCODE","one");//供应商编码
 				map.put("orderNumber","one");//销售订单号
@@ -1564,7 +1572,7 @@ public class SyPackingListTailoringController {
 				result.setMessage(message);
 			}else if(message.indexOf("成功")>-1){
 				main.setPushState("1");//推送成功！
-				main.setRecordingError(null);
+				main.setRecordingError("");
 				result.setSuccess(true);
 				result.setMessage(message);
 			}else{

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

@@ -36,6 +36,8 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
     //获取仓库编码
     public String getWhCodeByVenCode(String venCode);
 
+    public String getDictValue(String value);
+
     //获取供应商,区分来源
     public Map<String,Object> getOmOrPo(@Param("tableName") String tableName, @Param("orderName") String orderName, @Param("id") String id);
 

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

@@ -20,6 +20,8 @@
 			 and del_flag=0
 	</select>
 
+
+
 	<select id="querySpaplItemId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoringItem">
 		SELECT
 			id syPreAssembledPackingListItemId,

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

@@ -302,6 +302,13 @@
 		 limit 1
     </select>
 
+
+    <select id="getDictValue" parameterType="java.lang.String" resultType="java.lang.String">
+		select item_text from sys_dict_item
+		where dict_id='1643130506718834690' and item_value=#{value }
+		limit 1
+	</select>
+
     <select id="getCvenName" parameterType="java.lang.String" resultType="java.lang.String">
         select cVenName  from Vendor
         where cVenCode=#{value }

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

@@ -23,6 +23,9 @@ import java.util.Map;
  */
 public interface ISyPackingListTailoringService extends IService<SyPackingListTailoring> {
 
+
+	public String getDictValue(String value);
+
 	/**
 	 * 添加一对多
 	 *

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

@@ -73,7 +73,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		for (SyPackingListTailoringItem item : items){
 			maps.put(item.getGroupId(),item);//
 		}
+		System.out.println("maps\t"+maps);
 		for (SyPackingListTailoringItem item2 : items2){
+			System.out.println("groupid1\t"+item2.getGroupId());
 			if(maps.containsKey(item2.getGroupId())){//有这个分组id
 				SyPackingListTailoringItem item=maps.get(item2.getGroupId());
 				List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
@@ -144,6 +146,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return times;
 	}
 
+	@Override
+	public String getDictValue(String value) {
+		return syPackingListTailoringMapper.getDictValue(value);
+	}
+
 	@Override
 	//@Transactional
 	public synchronized SyPackingListTailoring saveMain2(SyPackingListTailoring syPackingListTailoring){
@@ -481,7 +488,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		long startTime = System.currentTimeMillis();
 		List<SyPackingListTailoringItem> items=syPackingListTailoring.getSyPackingListTailoringItemList();
 		syPackingListTailoringMapper.updateById(syPackingListTailoring);//修改主表数据
-		syPackingListTailoringItemMapper.deleteByMainId(syPackingListTailoring.getId());//将子表的删除状态都变成1
+		//syPackingListTailoringItemMapper.deleteByMainId(syPackingListTailoring.getId());//将子表的删除状态都变成1
 		if(syPackingListTailoring.getSyPackingListTailoringItemList()!=null){
 			update(syPackingListTailoring.getSyPackingListTailoringItemList(),syPackingListTailoring.getId());
 			//syPackingListTailoring.setTotalBoxes(box);
@@ -1160,7 +1167,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 
 			if(mapt.get("account").equals("101")){
-				map5.put("CDEFINE4",main.getLatestDateOfShipment2());//最终船期
+				map5.put("CDEFINE4",main.getLatestDateOfShipment2().substring(0,10));//最终船期
 			}
 
 			if(mapt.get("account").equals("103")){//查询委外订单主表数据	顺序---1
@@ -1292,7 +1299,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					mapItem6.put("CWHCODE",mapt.get("CWHCODE"));//仓库编码
 				}
 				mapt.put("poid","one");//重置销售订单id
-
+				if(map.get("account").equals("101")&&map.containsKey("vencode")){
+					map.put("CWHCODE",map.get("vencode"));//仓库编码
+					map4.put("CWHCODE",map.get("vencode"));//仓库编码
+					mapItem3.put("CWHCODE",map.get("vencode"));//仓库编码	这个是子表需要字段
+					mapItem6.put("CWHCODE",map.get("vencode"));//仓库编码
+				}
 				//if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据  顺序---5
 				if(orderDataItem!=null&&orderDataItem.containsKey("iSOsID")&&!orderDataItem.get("iSOsID").equals("")){
 					Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());