出库单完善：货架号、项目

platform-common/src/main/java/com/platform/common/yongyou/request/OtherOutDetail.java

@@ -4,6 +4,9 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
+/**
+ * 出库明细*
+ */
 @Data
 public class OtherOutDetail {
     private String id;// 1000000305, //主表ID
@@ -71,4 +74,8 @@ public class OtherOutDetail {
     private String imassdate;// null,
 
     private String dvdate;// null
+    private String citem_class;// "97"项目大类编码
+    private String citemcname;// 项目大类名称
+    private String citemcode;// 项目编码
+    private String cname;// 项目名称
 }

platform-common/src/main/java/com/platform/common/yongyou/response/GetCurrentStock.java

@@ -65,4 +65,21 @@ public class GetCurrentStock extends BaseResponse{
     private String cBatchProperty8; ;// 批次属性
     private String cBatchProperty9; ;// 批次属性
     private String cBatchProperty10; ;// 批次属性
+
+    private String cInvDefine1  ; //存库位的
+    private String cInvDefine2  ;
+    private String cInvDefine3  ;
+    private String cInvDefine4  ;
+    private String cInvDefine5  ;
+    private String cInvDefine6  ;
+    private String cInvDefine7  ;
+    private String cInvDefine8  ;
+    private String cInvDefine9  ;
+    private String cInvDefine10  ;
+    private String cInvDefine11  ;
+    private String cInvDefine12 ;
+    private String cInvDefine13  ;
+    private String cInvDefine14  ;
+    private String cInvDefine15  ;
+    private String cInvDefine16  ;
 }

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

@@ -141,10 +141,14 @@ public class OutStoreDetailDTO extends BaseDTO implements Serializable {
      */
     private LocalDateTime searchEndTime;
 
-
     private String yyId; // 用友单号id
     private String spareName; // 备件名称
     private String storeName; // 仓库名称
+    private String storePosition; // 货架号
+    private String projectNo; // 项目大类编码citem_class
+    private String projectName; // 项目大类名称citemcname
+    private String projectSecondNo; // 项目大类名称citemcname
+    private String projectSecondName; // 项目名称cname
     private String no; // 备件编号
     private String ggxh; // 备件规格型号
     private BigDecimal realNum; // 实际数量

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

@@ -100,13 +100,18 @@ public class OutStoreDetail implements Serializable {
 
 
     private String yyId;
-    ;// 用友单号id
+    // 用友单号id
     private String spareName;
-    ;// 备件名称
+    // 备件名称
     private String storeName;
-    ;// 仓库名称
+    private String storePosition; // 货架号
+    private String projectNo; // 项目大类编码citem_class
+    private String projectName; // 项目大类名称citemcname
+    private String projectSecondNo; // 项目大类名称citemcname
+    private String projectSecondName; // 项目名称cname
+    // 仓库名称
     private BigDecimal realNum;
-    ;// 实际数量
+    // 实际数量
     private String no; // 备件编号
     private String ggxh; // 备件规格型号
     private String cBatch; // 批次

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

@@ -111,6 +111,11 @@ public class OutStoreDetailVO extends BaseVO implements Serializable {
      * 仓库名称
      */
     private String storeName;
+    private String storePosition; // 货架号
+    private String projectNo; // 项目大类编码citem_class
+    private String projectName; // 项目大类名称citemcname
+    private String projectSecondNo; // 项目大类名称citemcname
+    private String projectSecondName; // 项目名称cname
     /**
      * 备件名称
      */

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

@@ -93,7 +93,10 @@ public class SpareStoreVO extends BaseVO implements Serializable {
      * 仓库id
      */
     private String storeId;
-
+    /**
+     * 货架号
+     */
+    private String storePosition;
     /**
      * 数量
      */

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

@@ -15,6 +15,11 @@
                                      outstoredetail.out_flag,
 outstoredetail.c_batch,
                                      outstoredetail.store_name,
+outstoredetail.store_position,
+outstoredetail.project_no,
+outstoredetail.project_name,
+outstoredetail.project_second_no,
+outstoredetail.project_second_name,
                                      outstoredetail.spare_name,
                                      outstoredetail.num,
                                      outstoredetail.price,
@@ -41,6 +46,11 @@ outstoredetail.c_batch,
                                      outstoredetail.yy_id,outstoredetail.auto_id,
                                      outstoredetail.out_flag,
                                      outstoredetail.store_name,
+outstoredetail.store_position,
+outstoredetail.project_no,
+outstoredetail.project_name,
+outstoredetail.project_second_no,
+outstoredetail.project_second_name,
                                      outstoredetail.spare_name,
                                      outstoredetail.num,
                                      outstoredetail.price,

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

@@ -178,6 +178,7 @@ public class YongyouServiceImpl implements YongyouService {
             partInfoVO.setUnit(stockResponse.getCComUnitName());
             partInfoVO.setCBatch(stockResponse.getCBatch());
             partInfoVO.setAutoId(stockResponse.getAutoId());
+            partInfoVO.setStorePosition(stockResponse.getCInvDefine1());
             partInfoVOS.add(partInfoVO);
         }
 
@@ -298,6 +299,10 @@ public class YongyouServiceImpl implements YongyouService {
             // detail.setIprice(vo.getTotalPrice());
             detail.setCbatch(vo.getCBatch());
             detail.setCdefine28(vo.getId());// 保存设备系统的单据明细id
+            detail.setCitem_class(vo.getProjectNo());
+            detail.setCitemcname(vo.getProjectName());
+            detail.setCitemcode(vo.getProjectSecondNo());
+            detail.setCname(vo.getProjectSecondName());
             otherOutDetail.add(detail);
         }