面辅料拉取调整、成本分配表调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/controller/SyCostAllocationController.java

@@ -258,6 +258,13 @@ public class SyCostAllocationController {
             return Result.error("该计划号未完成，不允许保存！");
         }
 
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("plan_num",planNum);
+        SyCostJson syCostJson=syCostJsonService.getOne(queryWrapper);
+        System.out.println("SyCostJson\t"+syCostJson);
+        if (syCostJson!=null&&!syCostJson.getStatus().equals("保存")){
+            return Result.error("该单据是"+syCostJson.getStatus()+"状态，不能保存");
+        }
         Result<T> result = syCostAllocationService.saveMain(planNum, json);
         return result;
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/CostAllocationReview.java

@@ -129,5 +129,6 @@ public class CostAllocationReview {
     private java.math.BigDecimal pkorgAmount;
     //公司承担金额人民币
     private java.math.BigDecimal pkorgAmountrmb;
-
+    //附件
+    private String attachs;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -261,7 +261,7 @@ GROUP BY planNo;
     </select>
 
     <select id="queryCostAllocation" resultType="org.jeecg.modules.documents.costLossReview.entity.CostAllocationReview">
-        select a.plan_num as planNum,a.first_approve_date as approvalDate,b.assigned_by as approvalMan,a.create_time as createTime,
+        select a.plan_num as planNum,a.first_approve_date as approvalDate,b.assigned_by as approvalMan,a.create_time as createTime,a.attachs,
         cost_info ->> '$.poStyleNum'  AS poStyleNum,
         cost_info ->> '$.exportSales'  AS exportSales,
         cost_info ->> '$.garmentContractno'  AS garmentContractno,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -194,7 +194,7 @@
 	<!--<select id="getu8Data"  resultMap="genderIsosid">-->
 	<select id="getu8Data"  resultMap="genderIsosid">
 		SELECT DISTINCT
-		sy_order_data_id AS isosid
+		left(sy_order_data_id,13) AS isosid
 		FROM `sy_shipping_details_item`
 		WHERE inventory_Ccode NOT LIKE '19%'
 		AND elements_Id IS NOT NULL

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

@@ -392,7 +392,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 * @return
 	 */
 	public String getMasterMetering(String id){
-		SyOrderDataItem syOrderDataItem=syOrderDataItemMapper.selectById(id);
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.eq("del_flag",0);
+		queryWrapper.like("id",id);
+		queryWrapper.orderByDesc("create_time");
+		queryWrapper.last("limit 1");
+		SyOrderDataItem syOrderDataItem=syOrderDataItemMapper.selectOne(queryWrapper);
 		return syOrderDataItem.getMasterMetering();
 	}
 
@@ -2340,7 +2345,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						sy1.setActualDeclaredQuantity(sy1.getInventoryQuantity());//给报关数量赋值
 						sy1.setGroupId(oConvertUtils.getId());
 						QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
-						queryWrapper2.eq("sy_order_data_item_id", sy1.getIsosid());
+						queryWrapper2.like("sy_order_data_item_id", sy1.getIsosid());
 						queryWrapper2.isNotNull("elements_Id");
 						queryWrapper2.eq("del_flag","0");
 						queryWrapper2.orderByDesc("update_time");

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

@@ -1377,7 +1377,7 @@ public class SyPackingListTailoringController implements Job {
 				 .or().eq("recording_Error","nullnull")
 				 .or().like("recording_Error","For input string:")
 				 .or().eq("recording_Error","nullnullnull").or().like("recording_Error","未能捕获到的错误"))) ;//推送中
-		/* queryWrapper.eq("push_State","3");//推送中
+		/*queryWrapper.eq("push_State","3");//推送中
 		 queryWrapper.or();
 		 queryWrapper.like("recording_Error","超时");//超时*/
 		 List<SyPackingListTailoring> syPackingListTailorings=syPackingListTailoringService.list(queryWrapper);//修改调整