降本项目

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

@@ -23,7 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailDTO extends BaseDTO implements Serializable {
-    private String cdefined33;//降本项目
+    private String cdefine33;//降本项目
 
     private Double cdefine26;//预算单价
 

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreDetailDTO.java

@@ -23,7 +23,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailDTO extends BaseDTO implements Serializable {
-    private String cdefined33;//降本项目
+    private String cdefine33;//降本项目
 
     /**
      * 车间

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

@@ -22,7 +22,7 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_detail")
 public class LongYanPurchaseDetail implements Serializable{
-    private String cdefined33;//降本项目
+    private String cdefine33;//降本项目
     private Double cdefine26;//预算单价
 
     private String cdefine30;//设备位号

platform-dao/src/main/java/com/platform/dao/entity/store/OutStoreDetail.java

@@ -24,7 +24,7 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_out_store_detail")
 public class OutStoreDetail implements Serializable {
-    private String cdefined33;//降本项目
+    private String cdefine33;//降本项目
 
     /**
      * 车间

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

@@ -23,7 +23,7 @@ import java.util.function.DoubleToLongFunction;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailVO extends BaseVO implements Serializable{
-    private String cdefined33;//降本项目
+    private String cdefine33;//降本项目
 
     private Double cdefine26;//预算单价
 

platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreDetailVO.java

@@ -25,7 +25,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailVO extends BaseVO implements Serializable {
-    private String cdefined33;//降本项目
+    private String cdefine33;//降本项目
     /**
      * 车间
      */

platform-dao/src/main/resources/mapper/store/OutStoreDetailMapper.xml

@@ -185,8 +185,17 @@ outstoredetail.project_second_name,
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_out_store_detail
             <set>
-                num=#{item.num},
-                total_price = #{item.totalPrice}
+                <if test="num!=null ">
+                    num=#{item.num}
+                </if>
+                <if test="total_price!=null">
+                    total_price = #{item.totalPrice}
+
+                </if>
+                <if test="cdefine33!=null and cdefine33!=''">
+                    cdefine33 = #{item.cdefine33}
+
+                </if>
             </set>
             where id = #{item.id}
         </foreach>

platform-rest/src/main/java/com/platform/rest/config/security/TokenEndpointAspect.java

@@ -236,4 +236,4 @@ public class TokenEndpointAspect {
     }
 
 
-}
+}

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -710,6 +710,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         // 新增
         for (OutStoreDetailDTO detail : detailList) {
             OutStoreDetail realDetail = detailMapper.selectByPrimaryKey(detail.getId());
+            realDetail.setCdefine33(detail.getCdefine33());
             if (ObjectUtil.isNull(realDetail)) {
                 detail.setUserInfo(userInfo);
                 detail.setOutId(model.getId());

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

@@ -1206,7 +1206,7 @@ public class YongyouServiceImpl implements YongyouService {
                 } else {
                     detail.setCdefine30(vo.getPositionNo());
                 }
-                detail.setCdefine33(orderVO.getCdefined33());
+                detail.setCdefine33(orderVO.getCdefine33());
                 detail.setCdefine26(orderVO.getCdefine26().toString());
                 detail.setCdefine22(orderVO.getCdefine22());
                 detail.setCdefine28(orderVO.getCdefine28());
@@ -1926,7 +1926,7 @@ public class YongyouServiceImpl implements YongyouService {
         List<OutStoreDetailVO> detailVOS = outStoreFormVO.getDetailList();
         for (OutStoreDetailVO vo : detailVOS) {
             OtherOutDetail detail = new OtherOutDetail();
-            detail.setCdefine33(vo.getCdefined33());
+            detail.setCdefine33(vo.getCdefine33());
             detail.setCdefine32(vo.getPositionName());
             detail.setId(vo.getSpareId());
             detail.setCinvcode(vo.getNo());