优化

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseOrderDTO.java

@@ -22,9 +22,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
-    private List<LongYanPurchaseDetailDTO> deleteDetails;
-    private List<LongYanPurchaseDetailDTO> addDetails;
-    private List<LongYanPurchaseDetailDTO> updateDetails;
+//    private List<LongYanPurchaseDetailDTO> deleteDetails;
+//    private List<LongYanPurchaseDetailDTO> addDetails;
+//    private List<LongYanPurchaseDetailDTO> updateDetails;
     private String purchaseNo;
     private Integer status;
     private Integer oldOrNew;

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -3,6 +3,7 @@ package com.platform.rest.controller.yongyou;
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.util.R;
+import com.platform.common.yongyou.request.Inventory;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
@@ -72,6 +73,13 @@ public class YongyouController {
         return new R<>();
     }
 
+    @SysLog("新增物料发起")
+    @PutMapping("/add/spare")
+    public R addSpare(Inventory inventory) {
+//        yongyouService.addOutForm(id, false);
+        return new R<>();
+    }
+
     /**
      * 用友回调领用出库单
      * 推送实际出库数量和状态

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -160,18 +160,24 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         order.setUpdateUserId(userInfo.getUserId());
         order.setUpdateUserName(userInfo.getRealName());
         mapper.updateByPrimaryKey(order);
-        List<LongYanPurchaseDetailDTO> addDetails = model.getAddDetails();
-        packageDetail(userInfo, addDetails,1);
-        longYanPurchaseDetailMapper.insertListforComplex(BeanConverterUtil.copyListProperties(addDetails,LongYanPurchaseDetail.class));
-        List<LongYanPurchaseDetailDTO> updateDetails = model.getUpdateDetails();
-        packageDetail(userInfo, updateDetails,2);
-        updateDetails.forEach((item)->{
-            longYanPurchaseDetailMapper.updateByPrimaryKeySelective(BeanConverterUtil.copyObjectProperties(item,LongYanPurchaseDetail.class));
-        });
-        List<LongYanPurchaseDetailDTO> deleteDetails = model.getDeleteDetails();
-        deleteDetails.forEach((item)->{
-            longYanPurchaseDetailMapper.deleteByPrimaryKey(item.getId());
-        });
+        LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
+        detail.setLongYangPurchaseOrderId(order.getId());
+        longYanPurchaseDetailMapper.delete(detail);
+        List<LongYanPurchaseDetailDTO> detailDTOS = model.getDetailDTOS();
+        if (detailDTOS!=null&&detailDTOS.size()>0) {
+            detailDTOS.forEach((item) -> {
+                item.setId(IdGeneratorUtils.getObjectId());
+                item.setLongYangPurchaseOrderId(model.getId());
+                item.setCreatedUserId(userInfo.getUserId());
+                item.setCreatedUserName(userInfo.getRealName());
+                item.setCreatedTime(LocalDateTime.now());
+                item.setUpdateUserId(userInfo.getUserId());
+                item.setUpdateUserName(userInfo.getRealName());
+                item.setUpdateTime(LocalDateTime.now());
+            });
+            longYanPurchaseDetailMapper.insertListforComplex(BeanConverterUtil.copyListProperties(detailDTOS,LongYanPurchaseDetail.class));
+        }
+
     }
 
     private void packageDetail(UserInfo userInfo, List<LongYanPurchaseDetailDTO> addDetails ,Integer type) {