1 yıl önce
ebeveyn
işleme
a9b427d1fc

+ 3 - 0
platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseDetailDTO.java

@@ -23,6 +23,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailDTO extends BaseDTO implements Serializable {
+    private String storeName;
+    private String storePosition;
+
     private LocalDate startTime;
     private LocalDate endTime;
     private List<String> longYanPurchaseOrderIds;

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

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

+ 3 - 0
platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseDetail.java

@@ -22,6 +22,9 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_detail")
 public class LongYanPurchaseDetail implements Serializable{
+    private String storeName;
+    private String storePosition;
+
     private String no;
     private String ggxh;
     private String spareName;

+ 1 - 0
platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseOrder.java

@@ -22,6 +22,7 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_order")
 public class LongYanPurchaseOrder implements Serializable{
+
     private String purchaseNo;
     private Integer status;
     private Integer oldOrNew;

+ 3 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseDetailVO.java

@@ -22,6 +22,9 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailVO extends BaseVO implements Serializable{
+    private String storeName;
+    private String storePosition;
+
     private String no;
     private String ggxh;
     private String spareName;

+ 1 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseOrderVO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
+
     private List<LongYanPurchaseDetailVO> detailVOS;
     private String complateProjectName;
     private String projectName;

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

@@ -159,24 +159,26 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         order.setUpdateTime(LocalDateTime.now());
         order.setUpdateUserId(userInfo.getUserId());
         order.setUpdateUserName(userInfo.getRealName());
-        mapper.updateByPrimaryKey(order);
         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());
-            });
+            BigDecimal totalNum = new BigDecimal(0);
+                for (LongYanPurchaseDetailDTO item:detailDTOS) {
+                    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());
+                    totalNum = totalNum.add(item.getNum());
+                }
             longYanPurchaseDetailMapper.insertListforComplex(BeanConverterUtil.copyListProperties(detailDTOS,LongYanPurchaseDetail.class));
         }
+        mapper.updateByPrimaryKeySelective(order);
 
     }