优化

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseOrderMapper.xml

@@ -196,12 +196,12 @@
     </update>
 
     <update id="updateBatch" parameterType="java.util.List">
-        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+        <foreach collection="list" item="item" index="index" separator=";">
             update t_long_yan_purchase_order orders
 
             <set>
             <if test="item.mergeId!=null and item.mergeId!=''">
-                orders.merge_id={item.mergeId}
+                orders.merge_id=#{item.mergeId}
             </if>
             </set>
             where orders.id = #{item.id}

platform-rest/src/main/java/com/platform/rest/controller/merge/LongYanPurchaseOrderMergeController.java

@@ -59,6 +59,8 @@ public class LongYanPurchaseOrderMergeController {
   @PostMapping("/{title}")
 //  @PreAuthorize("@pms.hasPermission('merge-merge-add')")
   public R save(@PathVariable String title,@RequestBody String purchaseOrderStr) {
+//      purchaseOrderStr = purchaseOrderStr.substring(1,purchaseOrderStr.length()-1);
+//      purchaseOrderStr = "\"purchaseOrderStr\":{\"id\":\"650c0197d7a14541a0aba317\",\"sbId\":null,\"type\":1,\"oldOrNew\":2,\"projectId\":null,\"positionNo\":null,\"cptcode\":\"01\",\"remark\":\"1212\",\"cdepcode\":\"10\",\"cbustype\":\"普通采购\",\"planGetDate\":\"2023-09-22\",\"needDate\":\"2023-09-22\"},{\"id\":\"65080e8ea619cc4ad48d3515\",\"sbId\":null,\"type\":1,\"oldOrNew\":1,\"projectId\":null,\"positionNo\":null,\"cptcode\":\"01\",\"remark\":\"旺旺\",\"cdepcode\":\"12\",\"cbustype\":\"普通采购\",\"planGetDate\":\"2023-09-19\",\"needDate\":\"2023-09-23\"}";
       List<LongYanPurchaseOrder> longYanPurchaseOrders = JSONArray.parseArray(purchaseOrderStr,LongYanPurchaseOrder.class);
       longYanPurchaseOrderMergeService.saveModelByList(title,longYanPurchaseOrders);
       return new R();

platform-service/src/main/java/com/platform/service/merge/impl/LongYanPurchaseOrderMergeServiceImpl.java

@@ -143,7 +143,7 @@ public class LongYanPurchaseOrderMergeServiceImpl extends BaseServiceImpl<LongYa
         Weekend<LongYanPurchaseOrder> weekend  = new Weekend<>(LongYanPurchaseOrder.class);
         WeekendCriteria<LongYanPurchaseOrder,Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andIn(LongYanPurchaseOrder::getId,idList);
-        weekendCriteria.andEqualTo(LongYanPurchaseOrder::getStatus,1);
+        weekendCriteria.andNotEqualTo(LongYanPurchaseOrder::getStatus,1);
         List<LongYanPurchaseOrder> list = longYanPurchaseOrderMapper.selectByExample(weekend);
         if (list!=null&&list.size()>0){
             throw new BusinessException("存在非草稿的采购单，不可合并！");