出库单优化

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

@@ -23,6 +23,11 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailDTO extends BaseDTO implements Serializable {
+    /**
+     * 车间
+     */
+    private String positionName;
+
     private Boolean addBom;
 
 

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

@@ -24,6 +24,10 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_out_store_detail")
 public class OutStoreDetail implements Serializable {
+    /**
+     * 车间
+     */
+    private String positionName;
 
     private String repairFormId;//关联维修工单
 

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

@@ -25,6 +25,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailVO extends BaseVO implements Serializable {
+    /**
+     * 车间
+     */
+    private String positionName;
 
     private Integer autoId;
     /**

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -165,6 +165,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="id!=null and id!=''">
+                and application.id =#{id}
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object"

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

@@ -10,6 +10,7 @@ import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
+import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.store.OutStoreDetailDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
@@ -30,6 +31,7 @@ import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.project.ProjectVO;
 import com.platform.dao.vo.query.store.*;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.event.WorkplaceBacklogEvent;
@@ -347,8 +349,18 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
             model.setProjectName(project.getParentName() + "->" + project.getName());
         }
         OutStoreForm outStoreForm = super.saveModelByDTO(model);
+        String positionName = "";
+        if (outStoreForm.getPickId()!=null){
+            RepairApplicationFormDTO formDTO = new RepairApplicationFormDTO();
+            formDTO.setId(outStoreForm.getPickId());
+            List<RepairApplicationFormVO> repairApplicationFormVOS = repairApplicationFormMapper.selectPageList(formDTO);
+            if (repairApplicationFormVOS!=null&&repairApplicationFormVOS.size()>0){
+                positionName = repairApplicationFormVOS.get(0).getSbPositionName();
+            }
+        }
         // 插
         for (OutStoreDetailDTO detail : detailList) {
+            detail.setPositionName(positionName);
 //            detail.setRepairFormId(model.getRepairFormId());
             detail.setUserInfo(userInfo);
             detail.setOutId(outStoreForm.getId());

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

@@ -1916,6 +1916,7 @@ public class YongyouServiceImpl implements YongyouService {
         List<OutStoreDetailVO> detailVOS = outStoreFormVO.getDetailList();
         for (OutStoreDetailVO vo : detailVOS) {
             OtherOutDetail detail = new OtherOutDetail();
+            detail.setCdefine31(vo.getPositionName());
             detail.setId(vo.getSpareId());
             detail.setCinvcode(vo.getNo());
             detail.setCitem_class(vo.getProjectNo());