web界面优化1.1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/order/ActAllocationDetailsController.java

@@ -57,10 +57,10 @@ public class ActAllocationDetailsController extends BaseController
     @PreAuthorize("@ss.hasPermi('ams:allocation:export')")
     @Log(title = "分配查询", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ActAllocationDTO actAllocationDTO)
+    public void export(HttpServletResponse response, ActAllocationDetails actAllocationDetails)
     {
-        List<ActAllocationDTO> list = invLotLocIdService.selectAllocationList(actAllocationDTO);
-        ExcelUtil<ActAllocationDTO> util = new ExcelUtil<ActAllocationDTO>(ActAllocationDTO.class);
+        List<ActAllocationDetails> list = actAllocationDetailsService.selectActAllocationDetailsList(actAllocationDetails);
+        ExcelUtil<ActAllocationDetails> util = new ExcelUtil<ActAllocationDetails>(ActAllocationDetails.class);
         util.exportExcel(response, list, "分配查询数据");
     }
 

warewms-ams/src/main/java/com/ruoyi/ams/asn/domain/WmsDocAsnHeader.java

@@ -27,7 +27,7 @@ public class WmsDocAsnHeader extends BaseEntity
     private String asnType;
 
     /** 单据状态 */
-    @Excel(name = "单据状态")
+    @Excel(name = "单据状态", dictType = "asn_status")
     private String asnStatus;
 
     /** 货主代码 */

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/ErpSkuInvServiceImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.mapper.ErpSkuInvMapper;
 import com.ruoyi.ams.erp.service.IErpSkuInvService;
 import com.ruoyi.ams.order.erp.ErpBarCodesVO;
+import com.ruoyi.ams.order.form.CheckOutInfoForm;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.BaseSku;
 import com.ruoyi.base.domain.BaseSkuType;
@@ -20,9 +21,8 @@ import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -86,21 +86,34 @@ public class ErpSkuInvServiceImpl implements IErpSkuInvService
                 StringUtils.isNotBlank(item.getSkuType())).map(BaseSku::getSkuType).map(Long::parseLong).distinct().collect(Collectors.toList());
         List<BaseSkuType> baseSkuTypeList = baseSkuTypeService.queryBaseSkuTypeList(skuTypeList);
         Map<Long, String> skuTypeMap = baseSkuTypeList.stream().collect(Collectors.toMap(BaseSkuType::getItemCode, BaseSkuType::getItemName));
-
         //库位信息
         Map<Long, BaseLocationInfo> baseLocationInfoMap = baseLocationInfoService.getBaseLocationInfoMap(
                 erpBarCodesVOList.stream().map(ErpBarCodesVO::getLocationId).distinct().collect(Collectors.toList()), locationNo);
-        for (ErpBarCodesVO erpBarCodes : erpBarCodesVOList) {
-            BaseLocationInfo baseLocationInfo = baseLocationInfoMap.get(erpBarCodes.getLocationId());
-            if (ObjectUtil.isNull(baseLocationInfo)) continue;
-            BaseSku baseSku = skuMap.get(erpBarCodes.getSku());
-            if (ObjectUtil.isNull(baseSku)) continue;
-            erpBarCodes.setLocationNo(baseLocationInfo.getLocationNo());
-            erpBarCodes.setSkuName(baseSku.getDesc1());
-            erpBarCodes.setSpecs(baseSku.getModel());
-            erpBarCodes.setSkuType(skuTypeMap.get(Long.parseLong(baseSku.getSkuType())));
-            result.add(erpBarCodes);
-        }
+        // 按栈板号分组
+        Map<String, List<ErpBarCodesVO>> palletNoMap = erpBarCodesVOList.stream().collect(Collectors.groupingBy(ErpBarCodesVO::getBoxNo));
+        palletNoMap.forEach((key, value) -> {
+            List<ErpBarCodesVO> erpBarCodesVOGroupByPalletNoList = value;
+            // 按照品名分组
+            Map<String, List<ErpBarCodesVO>> erpBarcodeBySkuMap = erpBarCodesVOGroupByPalletNoList.stream().collect(Collectors.groupingBy(ErpBarCodesVO::getSku));
+            erpBarCodesVOGroupByPalletNoList = erpBarCodesVOGroupByPalletNoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
+                    new TreeSet<>(Comparator.comparing(ErpBarCodesVO::getSku))), ArrayList::new));
+
+            for (ErpBarCodesVO erpBarCodes : erpBarCodesVOGroupByPalletNoList) {
+                BaseLocationInfo baseLocationInfo = baseLocationInfoMap.get(erpBarCodes.getLocationId());
+                if (ObjectUtil.isNull(baseLocationInfo)) continue;
+                BaseSku baseSku = skuMap.get(erpBarCodes.getSku());
+                if (ObjectUtil.isNull(baseSku)) continue;
+                erpBarCodes.setLocationNo(baseLocationInfo.getLocationNo());
+                erpBarCodes.setSkuName(baseSku.getDesc1());
+                erpBarCodes.setSpecs(baseSku.getModel());
+                erpBarCodes.setSkuType(skuTypeMap.get(Long.parseLong(baseSku.getSkuType())));
+                // 计算一个栈板中同种品名的数量合计
+                BigDecimal total = erpBarcodeBySkuMap.get(erpBarCodes.getSku()).stream().map(ErpBarCodesVO::getQty).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+                erpBarCodes.setQty(String.valueOf(total));
+                result.add(erpBarCodes);
+            }
+        });
+
         return result;
     }
 

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -172,6 +172,10 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
         List<InvLotLocIdLotattVO> invLotLocIdLotAttVOList = invLotLocIdMapper.selectInvLocIdLotattList(invLocIdSearchFrom);
         if (CollectionUtil.isEmpty(invLotLocIdLotAttVOList)) return invLotLocIdLotAttVOList;
 
+        // 物料信息
+        List<BaseSku> baseSkuList = baseSkuService.selectBaseSkuList(new BaseSku());
+        Map<String, BaseSku> baseSkuMap = baseSkuList.stream().collect(Collectors.toMap(BaseSku::getSku, Function.identity()));
+
         //托盘信息
         String isFull = StringUtils.isNotBlank(invLocIdSearchFrom.getIsFull()) ? invLocIdSearchFrom.getIsFull(): null;
         List<WmsBoxInfo> wmsBoxInfoList = iWmsBoxInfoService.queryWmsBoxInfoByPalletNoList(invLotLocIdLotAttVOList.stream().filter(item ->
@@ -192,6 +196,9 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
             item.setStockStatus(baseLocationInfoMap.get(item.getLocationId()).getStockStatus());
             item.setZoneId(baseLocationInfoMap.get(item.getLocationId()).getZoneId().toString());
             item.setIsFull(wmsBoxInfoMap.get(item.getLotatt07()).getIsFull());
+            BaseSku baseSku = baseSkuMap.get(item.getSku());
+            item.setSkuName(baseSku.getDesc1());
+            item.setSkuModel(baseSku.getModel());
         });
         return invLotLocIdLotAttVOList;
     }
@@ -1311,7 +1318,8 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
 
     @Override
     public List<ActAllocationDTO> selectAllocationList(ActAllocationDTO actAllocationDTO) {
-        return invLotLocIdMapper.selectAllocationList(actAllocationDTO);
+        List<ActAllocationDTO> actAllocationDTOS = invLotLocIdMapper.selectAllocationList(actAllocationDTO);
+        return actAllocationDTOS;
     }
 
     @Override

warewms-ams/src/main/java/com/ruoyi/ams/order/domain/ActAllocationDetails.java

@@ -1,6 +1,8 @@
 package com.ruoyi.ams.order.domain;
 
 import java.math.BigDecimal;
+
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-10-31
  */
+@Data
 public class ActAllocationDetails extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -27,10 +30,13 @@ public class ActAllocationDetails extends BaseEntity
     @Excel(name = "行号")
     private Long lineNo;
 
+    private String erpNo;
+
     /** 物料 */
     @Excel(name = "物料")
     private String material;
 
+    /** 物料名称 */
     private String skuName;
 
     /** 待检库位 */
@@ -70,368 +76,48 @@ public class ActAllocationDetails extends BaseEntity
     private BigDecimal pickQty;
 
     /**  */
-    @Excel(name = "")
+    @Excel(name = "erp单号")
     private String userdefine1;
 
     /**  */
-    @Excel(name = "")
     private String userdefine2;
 
     /**  */
-    @Excel(name = "")
     private String userdefine3;
 
-    /**  */
-    @Excel(name = "")
     private String userdefine4;
 
     private String lotatt01;
+    /** 条码 */
+    @Excel(name = "条码")
     private String lotatt02;
     private String lotatt03;
     private String lotatt04;
+    /** 质量状态 */
+    @Excel(name = "质量状态")
     private String lotatt05;
     private String lotatt06;
+    /** 托盘号 */
+    @Excel(name = "托盘号")
     private String lotatt07;
+    /** 入库单号 */
+    @Excel(name = "入库单号")
     private String lotatt08;
     private String lotatt09;
     private String lotatt10;
     private String lotatt11;
     private String lotatt12;
+    /** 收货日期 */
+    @Excel(name = "收货日期")
     private String lotatt13;
+    /** 已备货出库单号 */
+    @Excel(name = "已备货出库单号")
     private String lotatt14;
+    /** 已分配出库单号 */
+    @Excel(name = "已分配出库单号")
     private String lotatt15;
     private String lotatt16;
     private String lotatt17;
     private String lotatt18;
 
-    public void setAllocationId(String allocationId)
-    {
-        this.allocationId = allocationId;
-    }
-
-    public String getAllocationId()
-    {
-        return allocationId;
-    }
-    public void setOrderNo(String orderNo)
-    {
-        this.orderNo = orderNo;
-    }
-
-    public String getOrderNo()
-    {
-        return orderNo;
-    }
-    public void setLineNo(Long lineNo)
-    {
-        this.lineNo = lineNo;
-    }
-
-    public Long getLineNo()
-    {
-        return lineNo;
-    }
-    public void setMaterial(String material)
-    {
-        this.material = material;
-    }
-
-    public String getMaterial()
-    {
-        return material;
-    }
-    public void setLocationId(Long locationId)
-    {
-        this.locationId = locationId;
-    }
-
-    public String getSkuName() {
-        return skuName;
-    }
-
-    public void setSkuName(String skuName) {
-        this.skuName = skuName;
-    }
-
-    public Long getLocationId()
-    {
-        return locationId;
-    }
-    public String getLocationNo() {
-        return locationNo;
-    }
-
-    public void setLocationNo(String locationNo) {
-        this.locationNo = locationNo;
-    }
-    public void setCallTransactionId(String callTransactionId)
-    {
-        this.callTransactionId = callTransactionId;
-    }
-
-    public String getCallTransactionId()
-    {
-        return callTransactionId;
-    }
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-    public void setLotnum(String lotnum)
-    {
-        this.lotnum = lotnum;
-    }
-
-    public String getLotnum()
-    {
-        return lotnum;
-    }
-    public void setQty(BigDecimal qty)
-    {
-        this.qty = qty;
-    }
-
-    public BigDecimal getQty()
-    {
-        return qty;
-    }
-    public void setPickTransactionId(String pickTransactionId)
-    {
-        this.pickTransactionId = pickTransactionId;
-    }
-
-    public String getPickTransactionId()
-    {
-        return pickTransactionId;
-    }
-    public void setPickToLocation(String pickToLocation)
-    {
-        this.pickToLocation = pickToLocation;
-    }
-
-    public String getPickToLocation()
-    {
-        return pickToLocation;
-    }
-    public void setPickQty(BigDecimal pickQty)
-    {
-        this.pickQty = pickQty;
-    }
-
-    public BigDecimal getPickQty()
-    {
-        return pickQty;
-    }
-    public void setUserdefine1(String userdefine1)
-    {
-        this.userdefine1 = userdefine1;
-    }
-
-    public String getUserdefine1()
-    {
-        return userdefine1;
-    }
-    public void setUserdefine2(String userdefine2)
-    {
-        this.userdefine2 = userdefine2;
-    }
-
-    public String getUserdefine2()
-    {
-        return userdefine2;
-    }
-    public void setUserdefine3(String userdefine3)
-    {
-        this.userdefine3 = userdefine3;
-    }
-
-    public String getUserdefine3()
-    {
-        return userdefine3;
-    }
-    public void setUserdefine4(String userdefine4)
-    {
-        this.userdefine4 = userdefine4;
-    }
-
-    public String getUserdefine4()
-    {
-        return userdefine4;
-    }
-
-    public String getLotatt01() {
-        return lotatt01;
-    }
-
-    public void setLotatt01(String lotatt01) {
-        this.lotatt01 = lotatt01;
-    }
-
-    public String getLotatt02() {
-        return lotatt02;
-    }
-
-    public void setLotatt02(String lotatt02) {
-        this.lotatt02 = lotatt02;
-    }
-
-    public String getLotatt03() {
-        return lotatt03;
-    }
-
-    public void setLotatt03(String lotatt03) {
-        this.lotatt03 = lotatt03;
-    }
-
-    public String getLotatt04() {
-        return lotatt04;
-    }
-
-    public void setLotatt04(String lotatt04) {
-        this.lotatt04 = lotatt04;
-    }
-
-    public String getLotatt05() {
-        return lotatt05;
-    }
-
-    public void setLotatt05(String lotatt05) {
-        this.lotatt05 = lotatt05;
-    }
-
-    public String getLotatt06() {
-        return lotatt06;
-    }
-
-    public void setLotatt06(String lotatt06) {
-        this.lotatt06 = lotatt06;
-    }
-
-    public String getLotatt07() {
-        return lotatt07;
-    }
-
-    public void setLotatt07(String lotatt07) {
-        this.lotatt07 = lotatt07;
-    }
-
-    public String getLotatt08() {
-        return lotatt08;
-    }
-
-    public void setLotatt08(String lotatt08) {
-        this.lotatt08 = lotatt08;
-    }
-
-    public String getLotatt09() {
-        return lotatt09;
-    }
-
-    public void setLotatt09(String lotatt09) {
-        this.lotatt09 = lotatt09;
-    }
-
-    public String getLotatt10() {
-        return lotatt10;
-    }
-
-    public void setLotatt10(String lotatt10) {
-        this.lotatt10 = lotatt10;
-    }
-
-    public String getLotatt11() {
-        return lotatt11;
-    }
-
-    public void setLotatt11(String lotatt11) {
-        this.lotatt11 = lotatt11;
-    }
-
-    public String getLotatt12() {
-        return lotatt12;
-    }
-
-    public void setLotatt12(String lotatt12) {
-        this.lotatt12 = lotatt12;
-    }
-
-    public String getLotatt13() {
-        return lotatt13;
-    }
-
-    public void setLotatt13(String lotatt13) {
-        this.lotatt13 = lotatt13;
-    }
-
-    public String getLotatt14() {
-        return lotatt14;
-    }
-
-    public void setLotatt14(String lotatt14) {
-        this.lotatt14 = lotatt14;
-    }
-
-    public String getLotatt15() {
-        return lotatt15;
-    }
-
-    public void setLotatt15(String lotatt15) {
-        this.lotatt15 = lotatt15;
-    }
-
-    public String getLotatt16() {
-        return lotatt16;
-    }
-
-    public void setLotatt16(String lotatt16) {
-        this.lotatt16 = lotatt16;
-    }
-
-    public String getLotatt17() {
-        return lotatt17;
-    }
-
-    public void setLotatt17(String lotatt17) {
-        this.lotatt17 = lotatt17;
-    }
-
-    public String getLotatt18() {
-        return lotatt18;
-    }
-
-    public void setLotatt18(String lotatt18) {
-        this.lotatt18 = lotatt18;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("allocationId", getAllocationId())
-            .append("orderNo", getOrderNo())
-            .append("lineNo", getLineNo())
-            .append("material", getMaterial())
-            .append("locationId", getLocationId())
-            .append("callTransactionId", getCallTransactionId())
-            .append("status", getStatus())
-            .append("lotnum", getLotnum())
-            .append("locationNo", getLocationNo())
-            .append("qty", getQty())
-            .append("pickTransactionId", getPickTransactionId())
-            .append("pickToLocation", getPickToLocation())
-            .append("pickQty", getPickQty())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("userdefine1", getUserdefine1())
-            .append("userdefine2", getUserdefine2())
-            .append("userdefine3", getUserdefine3())
-            .append("userdefine4", getUserdefine4())
-            .toString();
-    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/mapper/WmsDocOrderHeaderMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
 import com.ruoyi.ams.order.vo.CheckOutVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -85,4 +86,6 @@ public interface WmsDocOrderHeaderMapper extends BaseMapper<WmsDocOrderHeader> {
      * @return
      */
     List<CheckOutVO> selectCheckOutList(List<String> orderNoList);
+
+    List<WmsDocOrderHeader> selectDocOrderHeaderByOrderNoList(@Param("orderNoList") List<String> orderNoList);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderHeaderService.java

@@ -512,4 +512,6 @@ public interface IWmsDocOrderHeaderService {
     Boolean updateWmsDocOrderHeaderStatus(String orderNo);
 
     BigDecimal getPalletInvCount(String palletNo);
+
+    List<WmsDocOrderHeader> selectDocOrderHeaderByOrderNoList(List<String> orderNoList);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/ActAllocationDetailsServiceImpl.java

@@ -3,10 +3,17 @@ package com.ruoyi.ams.order.service.impl;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.service.IWmsBoxInfoService;
+import com.ruoyi.ams.inv.domain.InvLotAtt;
+import com.ruoyi.ams.inv.service.IInvLotAttService;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
 import com.ruoyi.ams.order.form.ActAllocationDetailsFrom;
@@ -14,11 +21,14 @@ import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
 import com.ruoyi.ams.qc.domain.DocQcDetails;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
+import com.ruoyi.base.domain.BaseSku;
 import com.ruoyi.base.service.IBaseLocationInfoService;
+import com.ruoyi.base.service.IBaseSkuService;
 import com.ruoyi.base.utils.IdSequenceUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.ams.order.mapper.ActAllocationDetailsMapper;
@@ -45,6 +55,10 @@ public class ActAllocationDetailsServiceImpl implements IActAllocationDetailsSer
     private IBaseLocationInfoService baseLocationInfoService;
     @Autowired
     private IWmsDocOrderHeaderService wmsDocOrderHeaderService;
+    @Autowired
+    private IBaseSkuService baseSkuService;
+    @Autowired
+    private IInvLotAttService invLotAttService;
 
     /**
      * 查询分配查询
@@ -65,7 +79,32 @@ public class ActAllocationDetailsServiceImpl implements IActAllocationDetailsSer
      */
     @Override
     public List<ActAllocationDetails> selectActAllocationDetailsList(ActAllocationDetails actAllocationDetails) {
-        return actAllocationDetailsMapper.selectActAllocationDetailsList(actAllocationDetails);
+        // 查询分配查询数据
+        List<ActAllocationDetails> actAllocationDetailsList = actAllocationDetailsMapper.selectActAllocationDetailsList(actAllocationDetails);
+        if (CollUtil.isEmpty(actAllocationDetailsList)) return actAllocationDetailsList;
+        // 查询批次表
+        List<InvLotAtt> invLotAttList = invLotAttService.queryInvLotAttByLotNumList(actAllocationDetailsList.stream().map(ActAllocationDetails::getLotnum).collect(Collectors.toList()));
+        Map<String, InvLotAtt> invLotAttMap = invLotAttList.stream().collect(Collectors.toMap(InvLotAtt::getLotnum, Function.identity()));
+        List<String> orderNoList = actAllocationDetailsList.stream().map(ActAllocationDetails::getOrderNo).collect(Collectors.toList());
+
+        // 查询单据和物料信息
+        List<WmsDocOrderHeader> wmsDocOrderHeaderList = wmsDocOrderHeaderService.selectDocOrderHeaderByOrderNoList(orderNoList);
+        Map<String, String> wmsDocOrderHeaderErpNoMap = wmsDocOrderHeaderList.stream().collect(Collectors.toMap(WmsDocOrderHeader::getOrderNo, WmsDocOrderHeader::getSoReference1));
+        List<BaseSku> baseSkuList = baseSkuService.queryActiveSkuList(actAllocationDetailsList.stream().map(ActAllocationDetails::getMaterial).collect(Collectors.toList()));
+        Map<String, BaseSku> baseSkuMap = baseSkuList.stream().collect(Collectors.toMap(BaseSku::getSku, Function.identity()));
+
+        actAllocationDetailsList.stream().forEach(item-> {
+            InvLotAtt invLotAtt = invLotAttMap.get(item.getLotnum());
+            BaseSku baseSku = baseSkuMap.get(item.getMaterial());
+            item.setSkuName(ObjectUtil.isNotEmpty(invLotAtt) ? baseSku.getDesc1() : null);
+            item.setErpNo(wmsDocOrderHeaderErpNoMap.get(item.getOrderNo()));
+            item.setLotatt02(ObjectUtil.isNotEmpty(invLotAtt) ? invLotAtt.getLotatt02() : null);
+            item.setLotatt07(ObjectUtil.isNotEmpty(invLotAtt) ? invLotAtt.getLotatt07() : null);
+            item.setLotatt08(ObjectUtil.isNotEmpty(invLotAtt) ? invLotAtt.getLotatt08() : null);
+            item.setLotatt14(ObjectUtil.isNotEmpty(invLotAtt) ? invLotAtt.getLotatt14() : null);
+
+        });
+        return actAllocationDetailsList;
     }
 
     /**

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -3184,6 +3184,11 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         return new BigDecimal(count);
     }
 
+    @Override
+    public List<WmsDocOrderHeader> selectDocOrderHeaderByOrderNoList(List<String> orderNoList) {
+        return wmsDocOrderHeaderMapper.selectDocOrderHeaderByOrderNoList(orderNoList);
+    }
+
     private void unbindWmsDocOrder(String erpNo, String orderNo, BigDecimal qty, String sku, String sn){
         List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsService.queryWmsDocOrderDetails(orderNo, sku);
         if (CollectionUtil.isEmpty(wmsDocOrderDetailsList)) throw new BaseException("出库单明细为空!");

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -446,7 +446,7 @@
 
     <select id="selectInvLocIdLotattByLocationId" resultMap="InvLotLocIdLotattResult">
         select
-            inv.location_id,sk.sku,sk.specs,sk.desc1 sku_name,b.location_no,inv.qty,inv.qtyallocated
+            inv.location_id,sk.sku,sk.model sku_model,sk.desc1 sku_name,b.location_no,inv.qty,inv.qtyallocated
             ,att.lotnum, att.customer_id
              , lotatt01, lotatt02, lotatt03, lotatt04,qua.dict_label lotatt05, lotatt06, lotatt07, lotatt08
              , lotatt09, lotatt10, lotatt11, lotatt12, lotatt13, lotatt14, lotatt15, lotatt16, lotatt17, lotatt18
@@ -892,9 +892,9 @@
 
     <!--分配查询-->
     <select id="selectAllocationList" resultType="com.ruoyi.ams.order.domain.ActAllocationDTO">
-        select att.lotatt14 orderNo, sk.sku sku, sk.desc1 skuName, wdoh.order_status status, inv.qty pickQty, wdod.order_line_no lineNo,
+        select sk.sku sku, sk.desc1 skuName, wdoh.order_status status, inv.qty pickQty, wdod.order_line_no lineNo,
             inv.qtyallocated qty, bli.location_no locationNo ,bli.id locationId, att.lotatt02, att.lotatt05, att.lotatt07, att.lotatt08, att.lotatt13,
-            att.lotatt13, att.lotatt14, att.lotatt15, wdoh.so_reference1 erpNo, inv.create_time createTime, att.lotnum lotnum
+            att.lotatt13, att.lotatt14 orderNo, att.lotatt15, wdoh.so_reference1 erpNo, inv.create_time createTime, att.lotnum lotnum
         from inv_lot_loc_id inv
         left join base_location_info bli on bli.id = inv.location_id
         left join inv_lot_att att on att.lotnum = inv.lotnum
@@ -913,4 +913,8 @@
         </where>
     </select>
 
+    <resultMap id="selectAllocationListMap" type="ActAllocationDTO">
+
+    </resultMap>
+
 </mapper>

warewms-ams/src/main/resources/mapper/docOrder/ActAllocationDetailsMapper.xml

@@ -113,21 +113,14 @@
     </sql>
 
     <select id="selectActAllocationDetailsList" parameterType="ActAllocationDetails" resultMap="ActAllocationDetailsResult">
-        select t1.*
-        ,t2.lotatt01,t2.lotatt02,t2.lotatt03,t2.lotatt04,t2.lotatt05,t2.lotatt06
-        ,t2.lotatt07,t2.lotatt08,t2.lotatt09,t2.lotatt10,t2.lotatt11,t2.lotatt12
-        ,t2.lotatt13,t2.lotatt14,t2.lotatt15,t2.lotatt16,t2.lotatt17,t2.lotatt18
-        ,t3.location_no
-        from act_allocation_details t1
-        LEFT JOIN inv_lot_att t2 on t2.lotnum = t1.lotnum
-        left join base_location_info t3 on t3.id=t1.location_id
+        select *
+        from act_allocation_details
         <where>
-            <if test="allocationId != null  and allocationId != ''"> and t1.allocation_id = #{allocationId}</if>
-            <if test="orderNo != null  and orderNo != ''"> and t1.order_no = #{orderNo}</if>
-            <if test="locationId != null  and locationId != ''"> and t1.location_id = #{locationId}</if>
-            <if test="locationNo != null  and locationNo != ''"> and t3.location_no = #{locationNo}</if>
-            <if test="material != null  and material != ''"> and t1.material = #{material}</if>
-            <if test="status != null  and status != ''"> and t1.status = #{status}</if>
+            <if test="allocationId != null  and allocationId != ''"> and allocation_id = #{allocationId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
+            <if test="locationId != null  and locationId != ''"> and location_id = #{locationId}</if>
+            <if test="material != null  and material != ''"> and material like concat('%', #{material}, '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="params.beginTime != null and params.beginTime != ''">
                 AND date_format(t1.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
@@ -135,7 +128,7 @@
                 AND date_format(t1.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
-        order by t1.create_time desc
+        order by create_time desc
     </select>
 
     <select id="selectActAllocationDetailsInvLotAttList" parameterType="object" resultMap="ActAllocationDetailsInvLotAttResult">

warewms-ams/src/main/resources/mapper/docOrder/WmsDocOrderHeaderMapper.xml

@@ -425,4 +425,12 @@
         and act.`status` = '20' and b.stock_status = '00' and b.is_empty = 'N'
         group by de.order_no,b.location_no,att.lotatt07
     </select>
+
+    <select id="selectDocOrderHeaderByOrderNoList" resultMap="WmsDocOrderHeaderResult">
+        <include refid="selectWmsDocOrderHeaderVo"/>
+        where order_no in
+        <foreach item="orderNo" collection="orderNoList" open="(" separator="," close=")">
+            #{orderNo}
+        </foreach>
+    </select>
 </mapper>