优化

platform-dao/src/main/java/com/platform/dao/enums/LongYanPurchaseOrderStatusEnum.java

@@ -42,6 +42,18 @@ public enum LongYanPurchaseOrderStatusEnum {
      * 置换中
      */
     puchasing(6, "采购中"),
+
+    fail_push(0, "推送失败"),
+
+    discard(9, "已废弃"),
+
+    not_in_store(10, "未入库"),
+
+    part_in_store(11, "部分入库"),
+
+    all_in_store(12, "部分入库"),
+
+
     /**
      * 已置换
      */

platform-service/src/main/java/handler/yongyou/PurchaseOrderModNoticeHandler.java

@@ -7,6 +7,7 @@ import com.platform.common.util.R;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
+import com.platform.dao.enums.LongYanPurchaseOrderStatusEnum;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
 import handler.yongyou.BaseRequestHandler;
@@ -51,7 +52,11 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
         weekendCriteria.andEqualTo(LongYanPurchaseDetail::getLongYangPurchaseOrderId,order.getId());
         weekendCriteria.andIn(LongYanPurchaseDetail::getNo,spareNos);
         List<LongYanPurchaseDetail> details = longYanPurchaseDetailMapper.selectByExample(weekend);
+        int count = 0;
         for (PurchaseDetails details1:purchaseDetails){
+            if (1==details1.getStatus()){//已入库
+                count++;
+            }
             for (LongYanPurchaseDetail detail1: details){
                 if (detail1.getNo().equals(details1.getSpareNo())){
                     detail1.setDetailStatus(details1.getStatus());
@@ -61,10 +66,16 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
                 }
             }
         }
+        if (count==0){
+            order.setStatus(LongYanPurchaseOrderStatusEnum.not_in_store.getValue());
+        }else if (count>0&&count<purchaseDetails.size()){
+            order.setStatus(LongYanPurchaseOrderStatusEnum.part_in_store.getValue());
+        }else {
+            order.setStatus(LongYanPurchaseOrderStatusEnum.all_in_store.getValue());
+        }
 //        order.setStatus(request.getStatus());
 //        order.setRefuseRemark(request.getRemark());
 //        order.setUpdateTime(LocalDateTime.now());
-
         longYanPurchaseOrderMapper.updateByPrimaryKeySelective(order);
         ToYongYouBaseResponse response = new ToYongYouBaseResponse();
         R r = new R();