托书推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -22,6 +22,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -2110,6 +2111,12 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		 entity.setTimeStuta(1);
 		 syShippingOrderService.updateById(entity);
 
+		 UpdateWrapper<SyShippingOrderItem> itemUpdateWrapper = new UpdateWrapper<>();
+		 itemUpdateWrapper.set("push_srm_state","0");
+		 itemUpdateWrapper.eq("sy_shipping_order_item_id", id);
+		 itemUpdateWrapper.ne("push_srm_state","1");
+		 syShippingOrderItemService.update(itemUpdateWrapper);
+
 		 result.setResult("推送成功！");
 		 result.setSuccess(true);
 		 return result;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -498,10 +498,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
         if(entityList.size()!=0 && type.equals("1")){
             // 设置srm状态为未推送
-            UpdateWrapper<SyShippingOrderItem> itemUpdateWrapper = new UpdateWrapper<>();
-            itemUpdateWrapper.set("push_srm_state","0");
-            itemUpdateWrapper.in("sy_shipping_order_item_id", entityList.stream().map(SyShippingOrder::getId).collect(Collectors.toList()));
-            syShippingOrderItemService.update(itemUpdateWrapper);
+//            UpdateWrapper<SyShippingOrderItem> itemUpdateWrapper = new UpdateWrapper<>();
+//            itemUpdateWrapper.set("push_srm_state","0");
+//            itemUpdateWrapper.in("sy_shipping_order_item_id", entityList.stream().map(SyShippingOrder::getId).collect(Collectors.toList()));
+//            syShippingOrderItemService.update(itemUpdateWrapper);
 
             for(SyShippingOrder li:entityList){
                 li.setTheDocumentsState("1");