推送调整

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

@@ -968,7 +968,7 @@ public class SyPackingListFabricController {
 			 }
 			 Map<String,Object> map=new HashMap<>();
 			 SyPackingListFabric main=syPackingListFabricService.getById(ids);
-			 if(main.getIsReference()==1){
+			 if(main.getIsReference()==0){
 				 result.setSuccess(false);
 				 result.setMessage("请先做托书再推送");
 				 return result;

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

@@ -973,7 +973,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			JSONObject map2=new JSONObject();//材料出库单
 			map2.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","rdrecord11","dnmaketime")));//单号
 			map2.put("DDATE",createDate);//日期(格式2015-01-01)
-			map2.put("CHANDLER",createBy);//审核人
+			//map2.put("CHANDLER",createBy);//审核人
 			map2.put("CGLTYPE","委外订单");//出库类别
 			map2.put("CRDCODE","22");//暂时设置成默认 Rd_Style有相关数据
 			map2.put("CMAKER",createBy);//制单人
@@ -1019,9 +1019,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 
 			map.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map.put("CDEFINE6",main.getTheFinalShippingDate());//合同日期
+			map.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 			map5.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map5.put("CDEFINE6",main.getTheFinalShippingDate());//合同日期
+			map5.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 			map6.put("CDEFINE11",main.getEndCustomer());//最终客户
 			map6.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map6.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期

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

@@ -198,7 +198,9 @@
 		where id in
 		(select sy_shipping_order_item_id
 		from sy_shipping_order_item
-		where tailoring_fabric_id=#{value}  ) limit 1
+		where tailoring_fabric_id=#{value}  )
+		 and del_flag=0
+		 limit 1
     </select>
 
     <select id="getCvenName" parameterType="java.lang.String" resultType="java.lang.String">

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

@@ -796,6 +796,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		JSONArray mapList6=new JSONArray();
 
 		JSONArray mapLists=new JSONArray();
+		System.out.println("maptererere\t"+mapt);
 		//账套号
 		if (main!=null){
 			Map<String,String> mapSort=new HashMap<>();
@@ -811,9 +812,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map.put("CHANDLER",createBy);//审核人
 			map.put("cVouchType",1);//传1
 
-			map.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
-
 			JSONObject map3=new JSONObject();//销售发货单
 			map3.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cDLCode","DispatchList","dcreatesystime")));//发货单号
 			map3.put("DDATE",createDate);//发货日期（yyyy-MM-dd）
@@ -835,8 +833,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map5.put("CMAKER",createBy);//制单人
 			map5.put("CHANDLER",createBy);//审核人
 
-			map5.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
-			map5.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 
 			JSONObject map6=new JSONObject();//销售发票
 			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch","dcreatesystime")));//发票号
@@ -845,6 +841,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map6.put("CMAKER",createBy);//制单人名称
 			map6.put("CVERIFIER",createBy);//制单人名称
 
+			map.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			map.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
+			map5.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
+			map5.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期
 			map6.put("CDEFINE11",main.getEndCustomer());//最终客户
 			map6.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
 			map6.put("CDEFINE6",main.getTheFinalShippingDate2());//合同日期