1 년 전
부모
커밋
148fb3a6c5

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

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailDTO extends BaseDTO implements Serializable {
+    private String yongYouRemark;
     private String projectNo; // 项目大类编码citem_class
     private String projectName; // 项目大类名称citemcname
     private String projectSecondNo; // 项目大类名称citemcname

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

@@ -22,6 +22,8 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_detail")
 public class LongYanPurchaseDetail implements Serializable{
+    private String yongYouRemark;
+
     private String projectNo; // 项目大类编码citem_class
     private String projectName; // 项目大类名称citemcname
     private String projectSecondNo; // 项目大类名称citemcname

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

@@ -22,6 +22,7 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailVO extends BaseVO implements Serializable{
+    private String yongYouRemark;
     private String projectNo; // 项目大类编码citem_class
     private String projectName; // 项目大类名称citemcname
     private String projectSecondNo; // 项目大类名称citemcname

+ 2 - 1
platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseDetailMapper.xml

@@ -122,7 +122,8 @@ ORDER BY totalNum DESC
             on detail.long_yang_purchase_order_id = orders.id
             <set>  detail.`purchased_num` = #{item.purchasedNum},
             detail.`in_store_num` = #{item.inStoreNum},
-            detail.detail_status = #{item.detailStatus}
+            detail.detail_status = #{item.detailStatus},
+            detail.yong_you_remark = #{item.yongYouRemark}
         </set>
             where orders.yong_you_id = #{item.yongYouId}
             and detail.no = #{item.no}

+ 1 - 0
platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -2,6 +2,7 @@ package com.platform.service.yongyou.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
+import com.google.gson.JsonObject;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.cache.DictCache;
 import com.platform.common.exception.BusinessException;

+ 3 - 1
platform-service/src/main/java/handler/yongyou/PurchaseOrderModNoticeHandler.java

@@ -62,6 +62,7 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
                 order = longYanPurchaseOrderMapper.selectOne(order);
                 LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
                 detail.setLongYangPurchaseOrderId(order.getId());
+
                 Weekend<LongYanPurchaseDetail> weekend = new Weekend(LongYanPurchaseDetail.class);
                 WeekendCriteria<LongYanPurchaseDetail, Object> weekendCriteria = weekend.weekendCriteria();
                 weekendCriteria.andEqualTo(LongYanPurchaseDetail::getLongYangPurchaseOrderId, order.getId());
@@ -76,7 +77,8 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
                             addDetailStatus(details1,detail1);
                             detail1.setPurchasedNum(details1.getPurchasedNum());
                             detail1.setInStoreNum(details1.getInStoreNum());
-                            detail.setNo(details1.getSpareNo());
+                            detail1.setNo(details1.getSpareNo());
+                            detail1.setYongYouRemark(details1.getRemark());
                             updateDetails.add(detail1);
                             break;
                         }