浏览代码

出库管理优化

1 年之前
父节点
当前提交
001d8cdd07

+ 1 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/project/ProjectVO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class ProjectVO extends BaseVO implements Serializable {
+    private String parentNo;
     private String remark;
     private String parentName;
     private Integer sort;

+ 1 - 1
platform-dao/src/main/resources/mapper/project/ProjectMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.platform.dao.mapper.project.ProjectMapper">
     <sql id="Base_Column_List">
         t1.id,  t1.no, t1.name,  t1.parent_id,
-        pt.name as parentName,t1.type,t1.remark
+        pt.name as parentName,t1.type,t1.remark,pt.no as parentNo
     </sql>
 
     <select id="selectVOList" parameterType="com.platform.dao.dto.project.ProjectDTO"

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

@@ -304,6 +304,12 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         model.setUserInfo(userInfo);
         // 出库单详情
         List<OutStoreDetailDTO> detailList = model.getDetailList();
+        for (OutStoreDetailDTO detailDTO:detailList){
+            detailDTO.setProjectNo(project.getParentNo());
+            detailDTO.setProjectName(project.getParentName());
+            detailDTO.setProjectSecondNo(project.getNo());
+            detailDTO.setProjectSecondName(project.getName());
+        }
         List<String> storeIds = detailList.stream().map(OutStoreDetailDTO::getStoreId).distinct().collect(Collectors.toList());
         if (CollectionUtils.isEmpty(storeIds)) {
             throw new BusinessException("请选择仓库备件");

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

@@ -325,6 +325,10 @@ public class YongyouServiceImpl implements YongyouService {
             OtherOutDetail detail = new OtherOutDetail();
             detail.setId(vo.getSpareId());
             detail.setCinvcode(vo.getNo());
+            detail.setCitem_class(vo.getProjectNo());
+            detail.setCitemcname(vo.getProjectName());
+            detail.setCitemcode(vo.getProjectSecondNo());
+            detail.setCname(vo.getProjectSecondName());
             if (vo.getOutFlag() == YesNoEnum.YES.getValue()) {
                 detail.setIquantity(vo.getNum());
             } else {// 负数为退库