Merge remote-tracking branch 'origin/yonghu' into yonghu

# Conflicts:
#	ruoyi-admin/src/main/resources/application-dev.yml

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/InvLotLocIdController.java

@@ -6,6 +6,8 @@ import com.ruoyi.ams.inv.domain.form.InvLotLocIdAdjForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdMoveForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+import com.ruoyi.ams.order.domain.ActAllocationDTO;
+import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -132,9 +134,9 @@ public class InvLotLocIdController extends BaseController {
     @PreAuthorize("@ss.hasPermi('ams:invLotLocId:export')")
     @Log(title = "库位库存信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InvLotLocId invLotLocId) {
-        List<InvLotLocId> list = invLotLocIdService.selectInvLotLocIdList(invLotLocId);
-        ExcelUtil<InvLotLocId> util = new ExcelUtil<InvLotLocId>(InvLotLocId.class);
+    public void export(HttpServletResponse response, InvLocIdSearchFrom invLocIdSearchFrom) {
+        List<InvLotLocIdLotattVO> list = invLotLocIdService.selectInvLocIdLotattList(invLocIdSearchFrom);
+        ExcelUtil<InvLotLocIdLotattVO> util = new ExcelUtil<InvLotLocIdLotattVO>(InvLotLocIdLotattVO.class);
         util.exportExcel(response, list, "库位库存信息数据");
     }
 
@@ -182,4 +184,19 @@ public class InvLotLocIdController extends BaseController {
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdService.selectInvLocIdLotattByLocationId(locationId);
         return AjaxResult.success(invLotLocIdLotattVOS);
     }
+
+    /**
+     * 分配查询
+     * @param actAllocationDTO
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('ams:allocation:list')")
+    @GetMapping("/allocation/list")
+    public TableDataInfo list(ActAllocationDTO actAllocationDTO)
+    {
+        startPage();
+        List<ActAllocationDTO> list = invLotLocIdService.selectAllocationList(actAllocationDTO);
+        return getDataTable(list);
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warewms.pda;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
@@ -815,6 +816,19 @@ public class PdaController {
         }
     }
 
+    /**
+     * 根据库位获取托盘信息
+     */
+    @PostMapping("/boxInfo/queryBoxInfo")
+    public AjaxResult queryBoxInfo(@RequestBody WmsBoxInfo wmsBoxInfo) {
+        wmsBoxInfo.setLocationId(Constant.LOC_SORTATION_CACHE);
+        WmsBoxInfo boxInfo = wmsBoxInfoService.selectWmsBoxInfoByModel(wmsBoxInfo);
+        if (ObjectUtil.isNull(boxInfo) || StringUtils.isBlank(boxInfo.getBoxNo())) {
+            return AjaxResult.error(wmsBoxInfo.getLocationId()+"库位不存在存在该托盘");
+        }
+        return AjaxResult.success(wmsBoxInfo.getLocationId()+"库位存在存在该托盘");
+    }
+
     /**
      * 按照托盘进行库存调整
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/erp/ErpSkuInvController.java

@@ -38,7 +38,7 @@ public class ErpSkuInvController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:skuinv:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ErpBarcodes erpBarcodes)
+    public TableDataInfo list(ErpBarCodesVO erpBarcodes)
     {
         startPage();
         List<ErpBarCodesVO> list = erpSkuInvService.selectErpBarcodesList(erpBarcodes);
@@ -51,16 +51,11 @@ public class ErpSkuInvController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:skuinv:export')")
     @Log(title = "产品库存记录表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ErpBarcodes erpBarcodes)
+    public void export(HttpServletResponse response, ErpBarCodesVO erpBarcodes)
     {
         List<ErpBarCodesVO> list = erpSkuInvService.selectErpBarcodesList(erpBarcodes);
-        List<ErpSku> collect = list.stream().map(item -> {
-            ErpSku erpSku = new ErpSku();
-            BeanUtils.copyBeanProp(erpSku, item);
-            return erpSku;
-        }).collect(Collectors.toList());
-        ExcelUtil<ErpSku> util = new ExcelUtil<ErpSku>(ErpSku.class);
-        util.exportExcel(response, collect, "条码扫描记录表数据");
+        ExcelUtil<ErpBarCodesVO> util = new ExcelUtil<ErpBarCodesVO>(ErpBarCodesVO.class);
+        util.exportExcel(response, list, "条码扫描记录表数据");
     }
 
     /**

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

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.warewms.wms.order;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+import com.ruoyi.ams.order.domain.ActAllocationDTO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 分配查询Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-10-28
  */
@@ -33,6 +36,8 @@ public class ActAllocationDetailsController extends BaseController
 {
     @Autowired
     private IActAllocationDetailsService actAllocationDetailsService;
+    @Autowired
+    private IInvLotLocIdService invLotLocIdService;
 
     /**
      * 查询分配查询列表
@@ -52,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, ActAllocationDetails actAllocationDetails)
+    public void export(HttpServletResponse response, ActAllocationDTO actAllocationDTO)
     {
-        List<ActAllocationDetails> list = actAllocationDetailsService.selectActAllocationDetailsList(actAllocationDetails);
-        ExcelUtil<ActAllocationDetails> util = new ExcelUtil<ActAllocationDetails>(ActAllocationDetails.class);
+        List<ActAllocationDTO> list = invLotLocIdService.selectAllocationList(actAllocationDTO);
+        ExcelUtil<ActAllocationDTO> util = new ExcelUtil<ActAllocationDTO>(ActAllocationDTO.class);
         util.exportExcel(response, list, "分配查询数据");
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java

@@ -10,7 +10,7 @@ import com.ruoyi.common.utils.StringUtils;
 
 /**
  * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母
- * 
+ *
  * @author ruoyi
  */
 @Service("ss")
@@ -28,7 +28,7 @@ public class PermissionService
 
     /**
      * 验证用户是否具备某权限
-     * 
+     *
      * @param permission 权限字符串
      * @return 用户是否具备某权限
      */
@@ -87,7 +87,7 @@ public class PermissionService
 
     /**
      * 判断用户是否拥有某个角色
-     * 
+     *
      * @param role 角色字符串
      * @return 用户是否具备某角色
      */
@@ -153,7 +153,7 @@ public class PermissionService
 
     /**
      * 判断是否包含权限
-     * 
+     *
      * @param permissions 权限列表
      * @param permission 权限字符串
      * @return 用户是否具备某权限

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

@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 入库单对象 wms_doc_asn_header
- * 
+ *
  * @author ruoyi
  * @date 2022-10-12
  */
@@ -19,10 +19,11 @@ public class WmsDocAsnHeader extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 入库单号 */
+    @Excel(name = "入库单号")
     private String asnNo;
 
     /** 入库类型 */
-    @Excel(name = "入库类型")
+    @Excel(name = "入库类型", dictType = "asn_type")
     private String asnType;
 
     /** 单据状态 */
@@ -30,28 +31,23 @@ public class WmsDocAsnHeader extends BaseEntity
     private String asnStatus;
 
     /** 货主代码 */
-    @Excel(name = "货主代码")
     private String customerId;
 
     /** 客户单号 */
-    @Excel(name = "客户单号")
     private String customerNo;
 
     /** 采购单号 */
-    @Excel(name = "采购单号")
+    @Excel(name = "ERP单号")
     private String asnReference1;
 
     /** asn参考信息 */
-    @Excel(name = "asn参考信息")
     private String asnReference2;
 
     /** 释放状态 */
-    @Excel(name = "释放状态")
     private String releaseStatus;
 
     /** 预期到货时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预期到货时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expectedArriveTime;
 
     /** 上架单号 */
@@ -61,11 +57,9 @@ public class WmsDocAsnHeader extends BaseEntity
     private String qcNo;
 
     /** 备注 */
-    @Excel(name = "备注")
     private String notes;
 
     /** 供应商代码 */
-    @Excel(name = "供应商代码")
     private String supplierId;
 
     /** 车间号 */
@@ -87,6 +81,7 @@ public class WmsDocAsnHeader extends BaseEntity
     private String createBy;
 
     /** $column.columnComment */
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createTime;
 
     /** $column.columnComment */
@@ -98,6 +93,7 @@ public class WmsDocAsnHeader extends BaseEntity
     /** 是否有效(N删除Y有效) */
     private String activeFlag;
 
+    @Excel(name = "回传ERP")
     private String ediSendFlag;
 
     /** $column.columnComment */
@@ -148,165 +144,165 @@ public class WmsDocAsnHeader extends BaseEntity
     /** 入库单体信息 */
     private List<WmsDocAsnDetails> wmsDocAsnDetailsList;
 
-    public void setAsnNo(String asnNo) 
+    public void setAsnNo(String asnNo)
     {
         this.asnNo = asnNo;
     }
 
-    public String getAsnNo() 
+    public String getAsnNo()
     {
         return asnNo;
     }
-    public void setAsnType(String asnType) 
+    public void setAsnType(String asnType)
     {
         this.asnType = asnType;
     }
 
-    public String getAsnType() 
+    public String getAsnType()
     {
         return asnType;
     }
-    public void setAsnStatus(String asnStatus) 
+    public void setAsnStatus(String asnStatus)
     {
         this.asnStatus = asnStatus;
     }
 
-    public String getAsnStatus() 
+    public String getAsnStatus()
     {
         return asnStatus;
     }
-    public void setCustomerId(String customerId) 
+    public void setCustomerId(String customerId)
     {
         this.customerId = customerId;
     }
 
-    public String getCustomerId() 
+    public String getCustomerId()
     {
         return customerId;
     }
-    public void setCustomerNo(String customerNo) 
+    public void setCustomerNo(String customerNo)
     {
         this.customerNo = customerNo;
     }
 
-    public String getCustomerNo() 
+    public String getCustomerNo()
     {
         return customerNo;
     }
-    public void setAsnReference1(String asnReference1) 
+    public void setAsnReference1(String asnReference1)
     {
         this.asnReference1 = asnReference1;
     }
 
-    public String getAsnReference1() 
+    public String getAsnReference1()
     {
         return asnReference1;
     }
-    public void setAsnReference2(String asnReference2) 
+    public void setAsnReference2(String asnReference2)
     {
         this.asnReference2 = asnReference2;
     }
 
-    public String getAsnReference2() 
+    public String getAsnReference2()
     {
         return asnReference2;
     }
-    public void setReleaseStatus(String releaseStatus) 
+    public void setReleaseStatus(String releaseStatus)
     {
         this.releaseStatus = releaseStatus;
     }
 
-    public String getReleaseStatus() 
+    public String getReleaseStatus()
     {
         return releaseStatus;
     }
-    public void setExpectedArriveTime(Date expectedArriveTime) 
+    public void setExpectedArriveTime(Date expectedArriveTime)
     {
         this.expectedArriveTime = expectedArriveTime;
     }
 
-    public Date getExpectedArriveTime() 
+    public Date getExpectedArriveTime()
     {
         return expectedArriveTime;
     }
-    public void setPaNo(String paNo) 
+    public void setPaNo(String paNo)
     {
         this.paNo = paNo;
     }
 
-    public String getPaNo() 
+    public String getPaNo()
     {
         return paNo;
     }
-    public void setQcNo(String qcNo) 
+    public void setQcNo(String qcNo)
     {
         this.qcNo = qcNo;
     }
 
-    public String getQcNo() 
+    public String getQcNo()
     {
         return qcNo;
     }
-    public void setNotes(String notes) 
+    public void setNotes(String notes)
     {
         this.notes = notes;
     }
 
-    public String getNotes() 
+    public String getNotes()
     {
         return notes;
     }
-    public void setSupplierId(String supplierId) 
+    public void setSupplierId(String supplierId)
     {
         this.supplierId = supplierId;
     }
 
-    public String getSupplierId() 
+    public String getSupplierId()
     {
         return supplierId;
     }
-    public void setUserdefine1(String userdefine1) 
+    public void setUserdefine1(String userdefine1)
     {
         this.userdefine1 = userdefine1;
     }
 
-    public String getUserdefine1() 
+    public String getUserdefine1()
     {
         return userdefine1;
     }
-    public void setUserdefine2(String userdefine2) 
+    public void setUserdefine2(String userdefine2)
     {
         this.userdefine2 = userdefine2;
     }
 
-    public String getUserdefine2() 
+    public String getUserdefine2()
     {
         return userdefine2;
     }
-    public void setUserdefine3(String userdefine3) 
+    public void setUserdefine3(String userdefine3)
     {
         this.userdefine3 = userdefine3;
     }
 
-    public String getUserdefine3() 
+    public String getUserdefine3()
     {
         return userdefine3;
     }
-    public void setUserdefine4(String userdefine4) 
+    public void setUserdefine4(String userdefine4)
     {
         this.userdefine4 = userdefine4;
     }
 
-    public String getUserdefine4() 
+    public String getUserdefine4()
     {
         return userdefine4;
     }
-    public void setUserdefine5(String userdefine5) 
+    public void setUserdefine5(String userdefine5)
     {
         this.userdefine5 = userdefine5;
     }
 
-    public String getUserdefine5() 
+    public String getUserdefine5()
     {
         return userdefine5;
     }
@@ -356,11 +352,11 @@ public class WmsDocAsnHeader extends BaseEntity
         this.activeFlag = activeFlag;
     }
 
-    public String getActiveFlag() 
+    public String getActiveFlag()
     {
         return activeFlag;
     }
-    public void sethEdi01(String hEdi01) 
+    public void sethEdi01(String hEdi01)
     {
         this.hEdi01 = hEdi01;
     }
@@ -377,129 +373,129 @@ public class WmsDocAsnHeader extends BaseEntity
     {
         return hEdi01;
     }
-    public void sethEdi02(String hEdi02) 
+    public void sethEdi02(String hEdi02)
     {
         this.hEdi02 = hEdi02;
     }
 
-    public String gethEdi02() 
+    public String gethEdi02()
     {
         return hEdi02;
     }
-    public void sethEdi03(String hEdi03) 
+    public void sethEdi03(String hEdi03)
     {
         this.hEdi03 = hEdi03;
     }
 
-    public String gethEdi03() 
+    public String gethEdi03()
     {
         return hEdi03;
     }
-    public void sethEdi04(String hEdi04) 
+    public void sethEdi04(String hEdi04)
     {
         this.hEdi04 = hEdi04;
     }
 
-    public String gethEdi04() 
+    public String gethEdi04()
     {
         return hEdi04;
     }
-    public void sethEdi05(String hEdi05) 
+    public void sethEdi05(String hEdi05)
     {
         this.hEdi05 = hEdi05;
     }
 
-    public String gethEdi05() 
+    public String gethEdi05()
     {
         return hEdi05;
     }
-    public void sethEdi06(String hEdi06) 
+    public void sethEdi06(String hEdi06)
     {
         this.hEdi06 = hEdi06;
     }
 
-    public String gethEdi06() 
+    public String gethEdi06()
     {
         return hEdi06;
     }
-    public void sethEdi07(String hEdi07) 
+    public void sethEdi07(String hEdi07)
     {
         this.hEdi07 = hEdi07;
     }
 
-    public String gethEdi07() 
+    public String gethEdi07()
     {
         return hEdi07;
     }
-    public void sethEdi08(String hEdi08) 
+    public void sethEdi08(String hEdi08)
     {
         this.hEdi08 = hEdi08;
     }
 
-    public String gethEdi08() 
+    public String gethEdi08()
     {
         return hEdi08;
     }
-    public void sethEdi09(String hEdi09) 
+    public void sethEdi09(String hEdi09)
     {
         this.hEdi09 = hEdi09;
     }
 
-    public String gethEdi09() 
+    public String gethEdi09()
     {
         return hEdi09;
     }
-    public void sethEdi10(String hEdi10) 
+    public void sethEdi10(String hEdi10)
     {
         this.hEdi10 = hEdi10;
     }
 
-    public String gethEdi10() 
+    public String gethEdi10()
     {
         return hEdi10;
     }
-    public void sethEdi11(String hEdi11) 
+    public void sethEdi11(String hEdi11)
     {
         this.hEdi11 = hEdi11;
     }
 
-    public String gethEdi11() 
+    public String gethEdi11()
     {
         return hEdi11;
     }
-    public void sethEdi12(String hEdi12) 
+    public void sethEdi12(String hEdi12)
     {
         this.hEdi12 = hEdi12;
     }
 
-    public String gethEdi12() 
+    public String gethEdi12()
     {
         return hEdi12;
     }
-    public void sethEdi13(String hEdi13) 
+    public void sethEdi13(String hEdi13)
     {
         this.hEdi13 = hEdi13;
     }
 
-    public String gethEdi13() 
+    public String gethEdi13()
     {
         return hEdi13;
     }
-    public void sethEdi14(String hEdi14) 
+    public void sethEdi14(String hEdi14)
     {
         this.hEdi14 = hEdi14;
     }
 
-    public String gethEdi14() 
+    public String gethEdi14()
     {
         return hEdi14;
     }
-    public void sethEdi15(String hEdi15) 
+    public void sethEdi15(String hEdi15)
     {
         this.hEdi15 = hEdi15;
     }
 
-    public String gethEdi15() 
+    public String gethEdi15()
     {
         return hEdi15;
     }

warewms-ams/src/main/java/com/ruoyi/ams/erp/mapper/ErpSkuInvMapper.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * 产品库存记录Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-03-10
  */
@@ -23,7 +23,7 @@ public interface ErpSkuInvMapper
      * 查询产品库存记录
      *
      */
-     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarCodesVO erpBarcodes);
 
     /**
      * 新增产品库存记录

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

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * 产品库存记录Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-03-10
  */
@@ -23,13 +23,13 @@ public interface IErpSkuInvService
      * 查询产品库存记录
      *
      */
-     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarCodesVO erpBarcodes);
 
     /**
      * 查询产品库存记录
      *
      */
-    ErpBarCodesVO selectErpBarcodesByModel(ErpBarcodes erpBarcodes);
+    ErpBarCodesVO selectErpBarcodesByModel(ErpBarCodesVO erpBarcodes);
 
     /**
      * 新增产品库存记录

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * 产品库存记录Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-03-10
  */
@@ -38,7 +38,7 @@ public class ErpSkuInvServiceImpl implements IErpSkuInvService
      *
      */
     @Override
-    public List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes)
+    public List<ErpBarCodesVO> selectErpBarcodesList(ErpBarCodesVO erpBarcodes)
     {
         return erpSkuInvMapper.selectErpBarcodesList(erpBarcodes);
     }
@@ -48,7 +48,7 @@ public class ErpSkuInvServiceImpl implements IErpSkuInvService
      *
      */
     @Override
-    public ErpBarCodesVO selectErpBarcodesByModel(ErpBarcodes erpBarcodes)
+    public ErpBarCodesVO selectErpBarcodesByModel(ErpBarCodesVO erpBarcodes)
     {
         List<ErpBarCodesVO> list = erpSkuInvMapper.selectErpBarcodesList(erpBarcodes);
         if (list!=null && list.size()>0) {

warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/vo/InvLotLocIdLotattVO.java

@@ -1,315 +1,65 @@
 package com.ruoyi.ams.inv.domain.vo;
 
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
 /**
  * Created by IntelliJ IDEA.
  * User: andy.qu
  * Date: 2022/3/14
  */
+@Data
 public class InvLotLocIdLotattVO {
     private Long locationId;
     private String lotnum;
     private String customerId;
+    @Excel(name = "物料编号")
     private String sku;
+    @Excel(name = "物料名称")
     private String skuName;
+    @Excel(name = "物料种类")
     private String skuTypeName;
     private String skuModel;
+    @Excel(name = "库位")
     private String locationNo;
     private String zoneId;
+    @Excel(name = "库位状态")
     private String stockStatus;
     private String isEmpty;
+    @Excel(name = "库区")
     private String zoneName;
+    @Excel(name = "库存数量")
     private Double qty;
+    @Excel(name = "已分配数量")
     private Double qtyallocated;
     private String palletNo;
+    @Excel(name = "是否满托")
     private String isFull;
     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;
+    private String specs;
 
-    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;
-    }
-
-    public String getLotnum() {
-        return lotnum;
-    }
-
-    public void setLotnum(String lotnum) {
-        this.lotnum = lotnum;
-    }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getSku() {
-        return sku;
-    }
-
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-    public String getLocationNo() {
-        return locationNo;
-    }
-
-    public void setLocationNo(String locationNo) {
-        this.locationNo = locationNo;
-    }
-
-    public Double getQty() {
-        return qty;
-    }
-
-    public void setQty(Double qty) {
-        this.qty = qty;
-    }
-
-    public Double getQtyallocated() {
-        return qtyallocated;
-    }
-
-    public void setQtyallocated(Double qtyallocated) {
-        this.qtyallocated = qtyallocated;
-    }
-
-    public Long getLocationId() {
-        return locationId;
-    }
-
-    public void setLocationId(Long locationId) {
-        this.locationId = locationId;
-    }
-
-    public String getSkuName() {
-        return skuName;
-    }
-
-    public void setSkuName(String skuName) {
-        this.skuName = skuName;
-    }
-
-    public String getSkuTypeName() {
-        return skuTypeName;
-    }
-
-    public void setSkuTypeName(String skuTypeName) {
-        this.skuTypeName = skuTypeName;
-    }
-
-    public String getPalletNo() {
-        return palletNo;
-    }
-
-    public void setPalletNo(String palletNo) {
-        this.palletNo = palletNo;
-    }
-
-    public String getIsFull() {
-        return isFull;
-    }
-
-    public void setIsFull(String isFull) {
-        this.isFull = isFull;
-    }
-
-    public String getZoneName() {
-        return zoneName;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public String getSkuModel() {
-        return skuModel;
-    }
-
-    public void setSkuModel(String skuModel) {
-        this.skuModel = skuModel;
-    }
-
-    public String getStockStatus() {
-        return stockStatus;
-    }
-
-    public void setStockStatus(String stockStatus) {
-        this.stockStatus = stockStatus;
-    }
-
-    public String getIsEmpty() {
-        return isEmpty;
-    }
-
-    public void setIsEmpty(String isEmpty) {
-        this.isEmpty = isEmpty;
-    }
-
-    public String getZoneId() {
-        return zoneId;
-    }
-
-    public void setZoneId(String zoneId) {
-        this.zoneId = zoneId;
-    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/mapper/InvLotLocIdMapper.java

@@ -11,6 +11,8 @@ import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.domain.form.InvLocIdSearchFrom;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
+import com.ruoyi.ams.order.domain.ActAllocationDTO;
+import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.apache.ibatis.annotations.Param;
@@ -344,4 +346,11 @@ public interface InvLotLocIdMapper extends BaseMapper<InvLotLocId> {
      * 根据条件更新已分配数
      */
     int updateLocation(@Param("fromLocationId") Long fromLocationId, @Param("toLocationId") Long toLocationId);
+
+    /**
+     * 分配查询
+     * @param actAllocationDTO
+     * @return
+     */
+    List<ActAllocationDTO> selectAllocationList(ActAllocationDTO actAllocationDTO);
 }

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

@@ -10,6 +10,8 @@ import com.ruoyi.ams.inv.domain.form.InvLotLocIdForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdMoveForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.dto.InvLotLocIdSurplusQtyDTO;
+import com.ruoyi.ams.order.domain.ActAllocationDTO;
+import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.form.LineReleaseFrom;
 import com.ruoyi.base.domain.form.BasLocationForm;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -454,4 +456,11 @@ public interface IInvLotLocIdService {
      * @return
      */
     Boolean updateInvLotLocId(String lotNum, String lotNumTo, BigDecimal qty, BigDecimal qtyAllocated, String sku, String locationId);
+
+    /**
+     * 分配查询
+     * @param actAllocationDTO
+     * @return
+     */
+    List<ActAllocationDTO> selectAllocationList(ActAllocationDTO actAllocationDTO);
 }

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

@@ -23,6 +23,8 @@ import com.ruoyi.ams.inv.dto.InvLotLocIdSurplusQtyDTO;
 import com.ruoyi.ams.inv.mapper.InvLotAttMapper;
 import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+import com.ruoyi.ams.order.domain.ActAllocationDTO;
+import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
 import com.ruoyi.ams.order.form.LineReleaseFrom;
 import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
@@ -1211,4 +1213,9 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         ) > 0;
     }
 
+    @Override
+    public List<ActAllocationDTO> selectAllocationList(ActAllocationDTO actAllocationDTO) {
+        return invLotLocIdMapper.selectAllocationList(actAllocationDTO);
+    }
+
 }

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

@@ -0,0 +1,106 @@
+package com.ruoyi.ams.order.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ActAllocationDTO extends BaseEntity {
+
+    /**
+     * 订单号
+     */
+    @Excel(name = "订单号", sort = 1)
+    private String orderNo;
+
+    /**
+     * 行号
+     */
+    @Excel(name = "行号", sort = 2)
+    private Long lineNo;
+
+    /**
+     * 物料编码
+     */
+    @Excel(name = "物料编码", sort = 3)
+    private String sku;
+
+    /**
+     * 物料名称
+     */
+    @Excel(name = "物料名称", sort = 4)
+    private String skuName;
+
+    /**
+     * 待检库位
+     */
+    @Excel(name = "待检库位", sort = 5)
+    private Long locationId;
+
+    /**
+     * 库位编码
+     */
+    @Excel(name = "库位编码", sort = 6)
+    private String locationNo;
+
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", dictType = "so_status", sort = 7)
+    private String status;
+
+    /**
+     * 批次号
+     */
+    @Excel(name = "批次号", sort = 8)
+    private String lotnum;
+
+    /**
+     * 分配数量
+     */
+    @Excel(name = "分配数量", sort = 9)
+    private BigDecimal qty;
+
+    /**
+     * ERP单号
+     */
+    @Excel(name = "ERP单号", sort = 10)
+    private String erpNo;
+
+    /**
+     * 拣货库位
+     */
+    @Excel(name = "拣货库位", sort = 11)
+    private String pickToLocation;
+
+    /**
+     * 拣货数量
+     */
+    @Excel(name = "拣货数量", sort = 12)
+    private BigDecimal pickQty;
+
+    /** 条码 */
+    @Excel(name = "条码", sort = 13)
+    private String lotatt02;
+    /** 质量状态 */
+    @Excel(name = "质量状态", sort = 14)
+    private String lotatt05;
+    /** 托盘号 */
+    @Excel(name = "托盘号", sort = 15)
+    private String lotatt07;
+    /** 入库单号 */
+    @Excel(name = "入库单号", sort = 16)
+    private String lotatt08;
+    /** 收货日期 */
+    @Excel(name = "收货日期", sort = 17)
+    private String lotatt13;
+    /** 已备货出库单号 */
+    @Excel(name = "已备货出库单号", sort = 18)
+    private String lotatt14;
+    /** 已分配出库单号 */
+    @Excel(name = "已分配出库单号", sort = 19)
+    private String lotatt15;
+
+}

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

@@ -7,6 +7,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 出库单对象 wms_doc_order_header
- * 
+ *
  * @author ruoyi
  * @date 2022-11-14
  */
@@ -22,198 +23,153 @@ public class WmsDocOrderHeader extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 出库单号 */
-    private String orderNo;
-
-    /** 货主代码 */
-    @Excel(name = "货主代码")
-    private String customerId;
-
     /** 单据状态 */
-    @Excel(name = "单据状态")
+    @Excel(name = "单据状态", dictType = "so_status")
     private String orderStatus;
 
     /** 单据类型 */
-    @Excel(name = "单据类型")
+    @Excel(name = "单据类型", dictType = "so_type")
     private String orderType;
 
     /** 客户单号1 */
-    @Excel(name = "客户单号1")
+    @Excel(name = "ERP单号")
     private String soReference1;
 
     /** 客户单号2 */
-    @Excel(name = "客户单号2")
     private String soReference2;
 
     /** 客户单号3 */
-    @Excel(name = "客户单号3")
     private String soReference3;
 
     /** 单据操作优先级（按天） */
-    @Excel(name = "单据操作优先级", readConverterExp = "按=天")
     private String priority;
 
     /** 收货单位id */
-    @Excel(name = "收货单位id")
     private String consigneeId;
 
     /** 收货单位名称 */
-    @Excel(name = "收货单位名称")
     private String consigneeName;
 
     /** 国家 */
-    @Excel(name = "国家")
     private String cusCountry;
 
     /** 省 */
-    @Excel(name = "省")
     private String cusProvince;
 
     /** 市 */
-    @Excel(name = "市")
     private String cusCity;
 
     /** 区 */
-    @Excel(name = "区")
     private String cusDistrict;
 
     /** 收货地址 */
-    @Excel(name = "收货地址")
     private String cusAddress;
 
     /** 收货联系人 */
-    @Excel(name = "收货联系人")
     private String cusContact;
 
     /** 收货地址邮编 */
-    @Excel(name = "收货地址邮编")
     private String cusPostcode;
 
     /** 收货联系人邮箱 */
-    @Excel(name = "收货联系人邮箱")
     private String cusEmail;
 
     /** 发运单位id */
-    @Excel(name = "发运单位id")
     private String carrierId;
 
     /** 订单发运时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "订单发运时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date shipmentTime;
 
     /** 发运单位名称 */
-    @Excel(name = "发运单位名称")
     private String carrierName;
 
     /** 发运单号 */
-    @Excel(name = "发运单号")
     private String deliveryNo;
 
     /** 上游单据回传标识 */
-    @Excel(name = "上游单据回传标识")
+    @Excel(name = "回传ERP", dictType = "sys_yes_no")
     private String ediSendFlag;
 
     /** 仓库id */
-    @Excel(name = "仓库id")
     private String warehouseId;
 
     /** 目标货柜(移转目标刀具柜) */
-    @Excel(name = "目标货柜(移转目标刀具柜)")
     private String userdefine1;
 
     /** 预留字段2 */
-    @Excel(name = "预留字段2")
     private String userdefine2;
 
     /** 预留字段3 */
-    @Excel(name = "预留字段3")
     private String userdefine3;
 
     /** 预留字段4 */
-    @Excel(name = "预留字段4")
     private String userdefine4;
 
     /** 预留字段5 */
-    @Excel(name = "预留字段5")
     private String userdefine5;
 
     /** 拣货时保存之前状态 */
-    @Excel(name = "拣货时保存之前状态")
     private String userdefine6;
 
     /**  */
-    @Excel(name = "")
     @TableField(value = "h_edi_01")
     private String hEdi01;
 
     /**  */
-    @Excel(name = "h_edi_02")
     @TableField(value = "h_edi_02")
     private String hEdi02;
 
     /**  */
-    @Excel(name = "h_edi_03")
     @TableField(value = "h_edi_03")
     private String hEdi03;
 
     /**  */
-    @Excel(name = "h_edi_04")
     @TableField(value = "h_edi_04")
     private String hEdi04;
 
     /**  */
-    @Excel(name = "h_edi_05")
     @TableField(value = "h_edi_05")
     private String hEdi05;
 
     /**  */
-    @Excel(name = "h_edi_06")
     @TableField(value = "h_edi_06")
     private String hEdi06;
 
     /**  */
-    @Excel(name = "h_edi_07")
     @TableField(value = "h_edi_07")
     private String hEdi07;
 
     /**  */
-    @Excel(name = "h_edi_08")
+    @Excel(name = "更新备货记录")
     @TableField(value = "h_edi_08")
     private String hEdi08;
 
     /**  */
-    @Excel(name = "h_edi_09")
     @TableField(value = "h_edi_09")
     private BigDecimal hEdi09;
 
     /**  */
-    @Excel(name = "h_edi_10")
     @TableField(value = "h_edi_10")
     private BigDecimal hEdi10;
 
     /**  */
-    @Excel(name = "")
     @TableField(value = "h_edi_11")
     private String hEdi11;
 
     /**  */
-    @Excel(name = "")
     @TableField(value = "h_edi_12")
     private String hEdi12;
 
     /**  */
-    @Excel(name = "")
     @TableField(value = "h_edi_13")
     private String hEdi13;
 
     /**  */
-    @Excel(name = "")
     @TableField(value = "h_edi_14")
     private String hEdi14;
 
     /**  */
-    @Excel(name = "")
     @TableField(value = "h_edi_15")
     private String hEdi15;
 
@@ -221,476 +177,382 @@ public class WmsDocOrderHeader extends BaseEntity
     @TableField(exist = false)
     private List<WmsDocOrderDetails> wmsDocOrderDetailsList;
 
-    public void setOrderNo(String orderNo) 
-    {
-        this.orderNo = orderNo;
+    /** 出库单号 */
+    @Excel(name = "出库单号")
+    private String orderNo;
+
+    /** 货主代码 */
+    private String customerId;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
-    public String getOrderNo() 
-    {
+    public String getOrderNo() {
         return orderNo;
     }
-    public void setCustomerId(String customerId) 
-    {
-        this.customerId = customerId;
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
     }
 
-    public String getCustomerId() 
-    {
+    public String getCustomerId() {
         return customerId;
     }
-    public void setOrderStatus(String orderStatus) 
-    {
-        this.orderStatus = orderStatus;
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
     }
 
-    public String getOrderStatus() 
-    {
+    public String getOrderStatus() {
         return orderStatus;
     }
-    public void setOrderType(String orderType) 
-    {
-        this.orderType = orderType;
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
     }
 
-    public String getOrderType() 
-    {
+    public String getOrderType() {
         return orderType;
     }
-    public void setSoReference1(String soReference1) 
-    {
-        this.soReference1 = soReference1;
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
     }
 
-    public String getSoReference1() 
-    {
+    public String getSoReference1() {
         return soReference1;
     }
-    public void setSoReference2(String soReference2) 
-    {
-        this.soReference2 = soReference2;
+
+    public void setSoReference1(String soReference1) {
+        this.soReference1 = soReference1;
     }
 
-    public String getSoReference2() 
-    {
+    public String getSoReference2() {
         return soReference2;
     }
-    public void setSoReference3(String soReference3) 
-    {
-        this.soReference3 = soReference3;
+
+    public void setSoReference2(String soReference2) {
+        this.soReference2 = soReference2;
     }
 
-    public String getSoReference3() 
-    {
+    public String getSoReference3() {
         return soReference3;
     }
-    public void setPriority(String priority) 
-    {
-        this.priority = priority;
+
+    public void setSoReference3(String soReference3) {
+        this.soReference3 = soReference3;
     }
 
-    public String getPriority() 
-    {
+    public String getPriority() {
         return priority;
     }
-    public void setConsigneeId(String consigneeId) 
-    {
-        this.consigneeId = consigneeId;
+
+    public void setPriority(String priority) {
+        this.priority = priority;
     }
 
-    public String getConsigneeId() 
-    {
+    public String getConsigneeId() {
         return consigneeId;
     }
-    public void setConsigneeName(String consigneeName) 
-    {
-        this.consigneeName = consigneeName;
+
+    public void setConsigneeId(String consigneeId) {
+        this.consigneeId = consigneeId;
     }
 
-    public String getConsigneeName() 
-    {
+    public String getConsigneeName() {
         return consigneeName;
     }
-    public void setCusCountry(String cusCountry) 
-    {
-        this.cusCountry = cusCountry;
+
+    public void setConsigneeName(String consigneeName) {
+        this.consigneeName = consigneeName;
     }
 
-    public String getCusCountry() 
-    {
+    public String getCusCountry() {
         return cusCountry;
     }
-    public void setCusProvince(String cusProvince) 
-    {
-        this.cusProvince = cusProvince;
+
+    public void setCusCountry(String cusCountry) {
+        this.cusCountry = cusCountry;
     }
 
-    public String getCusProvince() 
-    {
+    public String getCusProvince() {
         return cusProvince;
     }
-    public void setCusCity(String cusCity) 
-    {
-        this.cusCity = cusCity;
+
+    public void setCusProvince(String cusProvince) {
+        this.cusProvince = cusProvince;
     }
 
-    public String getCusCity() 
-    {
+    public String getCusCity() {
         return cusCity;
     }
-    public void setCusDistrict(String cusDistrict) 
-    {
-        this.cusDistrict = cusDistrict;
+
+    public void setCusCity(String cusCity) {
+        this.cusCity = cusCity;
     }
 
-    public String getCusDistrict() 
-    {
+    public String getCusDistrict() {
         return cusDistrict;
     }
-    public void setCusAddress(String cusAddress) 
-    {
-        this.cusAddress = cusAddress;
+
+    public void setCusDistrict(String cusDistrict) {
+        this.cusDistrict = cusDistrict;
     }
 
-    public String getCusAddress() 
-    {
+    public String getCusAddress() {
         return cusAddress;
     }
-    public void setCusContact(String cusContact) 
-    {
-        this.cusContact = cusContact;
+
+    public void setCusAddress(String cusAddress) {
+        this.cusAddress = cusAddress;
     }
 
-    public String getCusContact() 
-    {
+    public String getCusContact() {
         return cusContact;
     }
-    public void setCusPostcode(String cusPostcode) 
-    {
-        this.cusPostcode = cusPostcode;
+
+    public void setCusContact(String cusContact) {
+        this.cusContact = cusContact;
     }
 
-    public String getCusPostcode() 
-    {
+    public String getCusPostcode() {
         return cusPostcode;
     }
-    public void setCusEmail(String cusEmail) 
-    {
-        this.cusEmail = cusEmail;
+
+    public void setCusPostcode(String cusPostcode) {
+        this.cusPostcode = cusPostcode;
     }
 
-    public String getCusEmail() 
-    {
+    public String getCusEmail() {
         return cusEmail;
     }
-    public void setCarrierId(String carrierId) 
-    {
-        this.carrierId = carrierId;
+
+    public void setCusEmail(String cusEmail) {
+        this.cusEmail = cusEmail;
     }
 
-    public String getCarrierId() 
-    {
+    public String getCarrierId() {
         return carrierId;
     }
-    public void setShipmentTime(Date shipmentTime) 
-    {
-        this.shipmentTime = shipmentTime;
+
+    public void setCarrierId(String carrierId) {
+        this.carrierId = carrierId;
     }
 
-    public Date getShipmentTime() 
-    {
+    public Date getShipmentTime() {
         return shipmentTime;
     }
-    public void setCarrierName(String carrierName) 
-    {
-        this.carrierName = carrierName;
+
+    public void setShipmentTime(Date shipmentTime) {
+        this.shipmentTime = shipmentTime;
     }
 
-    public String getCarrierName() 
-    {
+    public String getCarrierName() {
         return carrierName;
     }
-    public void setDeliveryNo(String deliveryNo) 
-    {
-        this.deliveryNo = deliveryNo;
+
+    public void setCarrierName(String carrierName) {
+        this.carrierName = carrierName;
     }
 
-    public String getDeliveryNo() 
-    {
+    public String getDeliveryNo() {
         return deliveryNo;
     }
-    public void setEdiSendFlag(String ediSendFlag) 
-    {
-        this.ediSendFlag = ediSendFlag;
+
+    public void setDeliveryNo(String deliveryNo) {
+        this.deliveryNo = deliveryNo;
     }
 
-    public String getEdiSendFlag() 
-    {
+    public String getEdiSendFlag() {
         return ediSendFlag;
     }
-    public void setWarehouseId(String warehouseId) 
-    {
-        this.warehouseId = warehouseId;
+
+    public void setEdiSendFlag(String ediSendFlag) {
+        this.ediSendFlag = ediSendFlag;
     }
 
-    public String getWarehouseId() 
-    {
+    public String getWarehouseId() {
         return warehouseId;
     }
-    public void setUserdefine1(String userdefine1) 
-    {
-        this.userdefine1 = userdefine1;
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
     }
 
-    public String getUserdefine1() 
-    {
+    public String getUserdefine1() {
         return userdefine1;
     }
-    public void setUserdefine2(String userdefine2) 
-    {
-        this.userdefine2 = userdefine2;
+
+    public void setUserdefine1(String userdefine1) {
+        this.userdefine1 = userdefine1;
     }
 
-    public String getUserdefine2() 
-    {
+    public String getUserdefine2() {
         return userdefine2;
     }
-    public void setUserdefine3(String userdefine3) 
-    {
-        this.userdefine3 = userdefine3;
+
+    public void setUserdefine2(String userdefine2) {
+        this.userdefine2 = userdefine2;
     }
 
-    public String getUserdefine3() 
-    {
+    public String getUserdefine3() {
         return userdefine3;
     }
-    public void setUserdefine4(String userdefine4) 
-    {
-        this.userdefine4 = userdefine4;
+
+    public void setUserdefine3(String userdefine3) {
+        this.userdefine3 = userdefine3;
     }
 
-    public String getUserdefine4() 
-    {
+    public String getUserdefine4() {
         return userdefine4;
     }
-    public void setUserdefine5(String userdefine5) 
-    {
-        this.userdefine5 = userdefine5;
+
+    public void setUserdefine4(String userdefine4) {
+        this.userdefine4 = userdefine4;
     }
 
-    public String getUserdefine5() 
-    {
+    public String getUserdefine5() {
         return userdefine5;
     }
-    public void setUserdefine6(String userdefine6) 
-    {
-        this.userdefine6 = userdefine6;
+
+    public void setUserdefine5(String userdefine5) {
+        this.userdefine5 = userdefine5;
     }
 
-    public String getUserdefine6() 
-    {
+    public String getUserdefine6() {
         return userdefine6;
     }
-    public void sethEdi01(String hEdi01) 
-    {
-        this.hEdi01 = hEdi01;
+
+    public void setUserdefine6(String userdefine6) {
+        this.userdefine6 = userdefine6;
     }
 
-    public String gethEdi01() 
-    {
+    public String gethEdi01() {
         return hEdi01;
     }
-    public void sethEdi02(String hEdi02) 
-    {
-        this.hEdi02 = hEdi02;
+
+    public void sethEdi01(String hEdi01) {
+        this.hEdi01 = hEdi01;
     }
 
-    public String gethEdi02() 
-    {
+    public String gethEdi02() {
         return hEdi02;
     }
-    public void sethEdi03(String hEdi03) 
-    {
-        this.hEdi03 = hEdi03;
+
+    public void sethEdi02(String hEdi02) {
+        this.hEdi02 = hEdi02;
     }
 
-    public String gethEdi03() 
-    {
+    public String gethEdi03() {
         return hEdi03;
     }
-    public void sethEdi04(String hEdi04) 
-    {
-        this.hEdi04 = hEdi04;
+
+    public void sethEdi03(String hEdi03) {
+        this.hEdi03 = hEdi03;
     }
 
-    public String gethEdi04() 
-    {
+    public String gethEdi04() {
         return hEdi04;
     }
-    public void sethEdi05(String hEdi05) 
-    {
-        this.hEdi05 = hEdi05;
+
+    public void sethEdi04(String hEdi04) {
+        this.hEdi04 = hEdi04;
     }
 
-    public String gethEdi05() 
-    {
+    public String gethEdi05() {
         return hEdi05;
     }
-    public void sethEdi06(String hEdi06) 
-    {
-        this.hEdi06 = hEdi06;
+
+    public void sethEdi05(String hEdi05) {
+        this.hEdi05 = hEdi05;
     }
 
-    public String gethEdi06() 
-    {
+    public String gethEdi06() {
         return hEdi06;
     }
-    public void sethEdi07(String hEdi07) 
-    {
-        this.hEdi07 = hEdi07;
+
+    public void sethEdi06(String hEdi06) {
+        this.hEdi06 = hEdi06;
     }
 
-    public String gethEdi07() 
-    {
+    public String gethEdi07() {
         return hEdi07;
     }
-    public void sethEdi08(String hEdi08) 
-    {
-        this.hEdi08 = hEdi08;
+
+    public void sethEdi07(String hEdi07) {
+        this.hEdi07 = hEdi07;
     }
 
-    public String gethEdi08() 
-    {
+    public String gethEdi08() {
         return hEdi08;
     }
-    public void sethEdi09(BigDecimal hEdi09) 
-    {
-        this.hEdi09 = hEdi09;
+
+    public void sethEdi08(String hEdi08) {
+        this.hEdi08 = hEdi08;
     }
 
-    public BigDecimal gethEdi09() 
-    {
+    public BigDecimal gethEdi09() {
         return hEdi09;
     }
-    public void sethEdi10(BigDecimal hEdi10) 
-    {
-        this.hEdi10 = hEdi10;
+
+    public void sethEdi09(BigDecimal hEdi09) {
+        this.hEdi09 = hEdi09;
     }
 
-    public BigDecimal gethEdi10() 
-    {
+    public BigDecimal gethEdi10() {
         return hEdi10;
     }
-    public void sethEdi11(String hEdi11) 
-    {
-        this.hEdi11 = hEdi11;
+
+    public void sethEdi10(BigDecimal hEdi10) {
+        this.hEdi10 = hEdi10;
     }
 
-    public String gethEdi11() 
-    {
+    public String gethEdi11() {
         return hEdi11;
     }
-    public void sethEdi12(String hEdi12) 
-    {
-        this.hEdi12 = hEdi12;
+
+    public void sethEdi11(String hEdi11) {
+        this.hEdi11 = hEdi11;
     }
 
-    public String gethEdi12() 
-    {
+    public String gethEdi12() {
         return hEdi12;
     }
-    public void sethEdi13(String hEdi13) 
-    {
-        this.hEdi13 = hEdi13;
+
+    public void sethEdi12(String hEdi12) {
+        this.hEdi12 = hEdi12;
     }
 
-    public String gethEdi13() 
-    {
+    public String gethEdi13() {
         return hEdi13;
     }
-    public void sethEdi14(String hEdi14) 
-    {
-        this.hEdi14 = hEdi14;
+
+    public void sethEdi13(String hEdi13) {
+        this.hEdi13 = hEdi13;
     }
 
-    public String gethEdi14() 
-    {
+    public String gethEdi14() {
         return hEdi14;
     }
-    public void sethEdi15(String hEdi15) 
-    {
-        this.hEdi15 = hEdi15;
+
+    public void sethEdi14(String hEdi14) {
+        this.hEdi14 = hEdi14;
     }
 
-    public String gethEdi15() 
-    {
+    public String gethEdi15() {
         return hEdi15;
     }
 
-    public List<WmsDocOrderDetails> getWmsDocOrderDetailsList()
-    {
-        return wmsDocOrderDetailsList;
+    public void sethEdi15(String hEdi15) {
+        this.hEdi15 = hEdi15;
     }
 
-    public void setWmsDocOrderDetailsList(List<WmsDocOrderDetails> wmsDocOrderDetailsList)
-    {
-        this.wmsDocOrderDetailsList = wmsDocOrderDetailsList;
+    public List<WmsDocOrderDetails> getWmsDocOrderDetailsList() {
+        return wmsDocOrderDetailsList;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("orderNo", getOrderNo())
-            .append("customerId", getCustomerId())
-            .append("orderStatus", getOrderStatus())
-            .append("orderType", getOrderType())
-            .append("soReference1", getSoReference1())
-            .append("soReference2", getSoReference2())
-            .append("soReference3", getSoReference3())
-            .append("priority", getPriority())
-            .append("consigneeId", getConsigneeId())
-            .append("consigneeName", getConsigneeName())
-            .append("cusCountry", getCusCountry())
-            .append("cusProvince", getCusProvince())
-            .append("cusCity", getCusCity())
-            .append("cusDistrict", getCusDistrict())
-            .append("cusAddress", getCusAddress())
-            .append("cusContact", getCusContact())
-            .append("cusPostcode", getCusPostcode())
-            .append("cusEmail", getCusEmail())
-            .append("carrierId", getCarrierId())
-            .append("shipmentTime", getShipmentTime())
-            .append("carrierName", getCarrierName())
-            .append("deliveryNo", getDeliveryNo())
-            .append("ediSendFlag", getEdiSendFlag())
-            .append("remark", getRemark())
-            .append("warehouseId", getWarehouseId())
-            .append("userdefine1", getUserdefine1())
-            .append("userdefine2", getUserdefine2())
-            .append("userdefine3", getUserdefine3())
-            .append("userdefine4", getUserdefine4())
-            .append("userdefine5", getUserdefine5())
-            .append("userdefine6", getUserdefine6())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("updateTime", getUpdateTime())
-            .append("updateBy", getUpdateBy())
-            .append("hEdi01", gethEdi01())
-            .append("hEdi02", gethEdi02())
-            .append("hEdi03", gethEdi03())
-            .append("hEdi04", gethEdi04())
-            .append("hEdi05", gethEdi05())
-            .append("hEdi06", gethEdi06())
-            .append("hEdi07", gethEdi07())
-            .append("hEdi08", gethEdi08())
-            .append("hEdi09", gethEdi09())
-            .append("hEdi10", gethEdi10())
-            .append("hEdi11", gethEdi11())
-            .append("hEdi12", gethEdi12())
-            .append("hEdi13", gethEdi13())
-            .append("hEdi14", gethEdi14())
-            .append("hEdi15", gethEdi15())
-            .append("wmsDocOrderDetailsList", getWmsDocOrderDetailsList())
-            .toString();
+    public void setWmsDocOrderDetailsList(List<WmsDocOrderDetails> wmsDocOrderDetailsList) {
+        this.wmsDocOrderDetailsList = wmsDocOrderDetailsList;
     }
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/erp/ErpBarCodesVO.java

@@ -11,16 +11,18 @@ public class ErpBarCodesVO {
     private String locationNo;  //货架编号
     @Excel(name = "栈板号")
     private String boxNo;       //栈板号
-    private String userdefine1;      //单位
+    private String userdefine1;
     @Excel(name = "数量")
     private String qty;         //数量
-    @Excel(name = "条码号")
     private String lotatt02;    //条码号
-    @Excel(name = "产品")
+    @Excel(name = "品号")
     private String sku;         //产品
+    @Excel(name = "产品类型")
     private String skuType;     //产品类型
-    @Excel(name = "ERP品号")
-    private String barcode;     //ERP品号
-    @Excel(name = "批次")
+    private String barcode;
     private String lotnum;      //批次号
+    @Excel(name = "品名")
+    private String skuName;
+    @Excel(name = "规格")
+    private String specs;
 }

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

@@ -1314,6 +1314,16 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
 
     @Override
     public AjaxResult groupDiskBHCheck(GroupDiskFrom groupDiskFrom) {
+
+        //根据托盘号和库位查询托盘信息
+        WmsBoxInfo queryBoxInfo = new WmsBoxInfo();
+        queryBoxInfo.setBoxNo(groupDiskFrom.getPalletNoTo());
+        queryBoxInfo.setLocationId(Constant.LOC_SORTATION_CACHE);
+        WmsBoxInfo boxInfo = wmsBoxInfoService.selectWmsBoxInfoByModel(queryBoxInfo);
+        if (ObjectUtil.isNull(boxInfo) || StringUtils.isBlank(boxInfo.getBoxNo())) {
+            return AjaxResult.error(queryBoxInfo.getLocationId()+"库位不存在存在该托盘");
+        }
+
         //通过ERP单号获取WMS的出库单号
         String orderNo = wmsDocOrderHeaderService.changeErpNoToOrderNo(groupDiskFrom.getOrderNo());
         if (StringUtils.isBlank(orderNo)) return AjaxResult.error("出库单号不存在！");

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

@@ -1,125 +1,126 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ams.inv.mapper.InvLotLocIdMapper">
 
     <resultMap type="InvLotLocId" id="InvLotLocIdResult">
-        <result property="lotnum"    column="lotnum"    />
-        <result property="locationId"    column="location_id"    />
-        <result property="traceid"    column="traceid"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="sku"    column="sku"    />
-        <result property="qty"    column="qty"    />
-        <result property="qtyEach"    column="qty_each"    />
-        <result property="qtyallocated"    column="qtyallocated"    />
-        <result property="qtyallocatedEach"    column="qtyallocated_each"    />
-        <result property="qtypa"    column="qtypa"    />
-        <result property="qtyrpin"    column="qtyrpin"    />
-        <result property="qtyrpout"    column="qtyrpout"    />
-        <result property="qtymvin"    column="qtymvin"    />
-        <result property="qtymvout"    column="qtymvout"    />
-        <result property="qtyonhold"    column="qtyonhold"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="lotnum" column="lotnum"/>
+        <result property="locationId" column="location_id"/>
+        <result property="traceid" column="traceid"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="sku" column="sku"/>
+        <result property="qty" column="qty"/>
+        <result property="qtyEach" column="qty_each"/>
+        <result property="qtyallocated" column="qtyallocated"/>
+        <result property="qtyallocatedEach" column="qtyallocated_each"/>
+        <result property="qtypa" column="qtypa"/>
+        <result property="qtyrpin" column="qtyrpin"/>
+        <result property="qtyrpout" column="qtyrpout"/>
+        <result property="qtymvin" column="qtymvin"/>
+        <result property="qtymvout" column="qtymvout"/>
+        <result property="qtyonhold" column="qtyonhold"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="invLotLocIdLotattVO" id="InvLotLocIdLotattResult">
-        <result property="lotnum"    column="lotnum"    />
-        <result property="locationNo"    column="location_no"    />
-        <result property="locationId"    column="location_id"    />
-        <result property="zoneId"    column="zone_id"    />
-        <result property="isEmpty"    column="isEmpty"    />
-        <result property="stockStatus"    column="stockStatus"    />
-        <result property="zoneName"    column="zone_name"    />
-        <result property="customerId"    column="customer_id"    />
-        <result property="sku"    column="sku"    />
-        <result property="skuName"    column="sku_name"    />
-        <result property="skuTypeName"    column="sku_type_name"    />
-        <result property="skuModel"    column="sku_model"    />
-        <result property="qty"    column="qty"    />
-        <result property="qtyallocated"    column="qtyallocated"    />
-        <result property="palletNo"    column="box_no"    />
-        <result property="isFull"    column="is_full"    />
-        <result property="lotnum"    column="lotnum"    />
-        <result property="lotatt01"    column="lotatt01"    />
-        <result property="lotatt02"    column="lotatt02"    />
-        <result property="lotatt03"    column="lotatt03"    />
-        <result property="lotatt04"    column="lotatt04"    />
-        <result property="lotatt05"    column="lotatt05"    />
-        <result property="lotatt06"    column="lotatt06"    />
-        <result property="lotatt07"    column="lotatt07"    />
-        <result property="lotatt08"    column="lotatt08"    />
-        <result property="lotatt09"    column="lotatt09"    />
-        <result property="lotatt10"    column="lotatt10"    />
-        <result property="lotatt11"    column="lotatt11"    />
-        <result property="lotatt12"    column="lotatt12"    />
-        <result property="lotatt13"    column="lotatt13"    />
-        <result property="lotatt14"    column="lotatt14"    />
-        <result property="lotatt15"    column="lotatt15"    />
-        <result property="lotatt16"    column="lotatt16"    />
-        <result property="lotatt17"    column="lotatt17"    />
-        <result property="lotatt18"    column="lotatt18"    />
+        <result property="lotnum" column="lotnum"/>
+        <result property="locationNo" column="location_no"/>
+        <result property="locationId" column="location_id"/>
+        <result property="zoneId" column="zone_id"/>
+        <result property="isEmpty" column="isEmpty"/>
+        <result property="stockStatus" column="stockStatus"/>
+        <result property="zoneName" column="zone_name"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="sku" column="sku"/>
+        <result property="skuName" column="sku_name"/>
+        <result property="skuTypeName" column="sku_type_name"/>
+        <result property="skuModel" column="sku_model"/>
+        <result property="qty" column="qty"/>
+        <result property="qtyallocated" column="qtyallocated"/>
+        <result property="palletNo" column="box_no"/>
+        <result property="isFull" column="is_full"/>
+        <result property="specs" column="specs"/>
+        <result property="lotnum" column="lotnum"/>
+        <result property="lotatt01" column="lotatt01"/>
+        <result property="lotatt02" column="lotatt02"/>
+        <result property="lotatt03" column="lotatt03"/>
+        <result property="lotatt04" column="lotatt04"/>
+        <result property="lotatt05" column="lotatt05"/>
+        <result property="lotatt06" column="lotatt06"/>
+        <result property="lotatt07" column="lotatt07"/>
+        <result property="lotatt08" column="lotatt08"/>
+        <result property="lotatt09" column="lotatt09"/>
+        <result property="lotatt10" column="lotatt10"/>
+        <result property="lotatt11" column="lotatt11"/>
+        <result property="lotatt12" column="lotatt12"/>
+        <result property="lotatt13" column="lotatt13"/>
+        <result property="lotatt14" column="lotatt14"/>
+        <result property="lotatt15" column="lotatt15"/>
+        <result property="lotatt16" column="lotatt16"/>
+        <result property="lotatt17" column="lotatt17"/>
+        <result property="lotatt18" column="lotatt18"/>
     </resultMap>
 
     <resultMap type="BaseLocationLotattVO" id="BaseLocationInfoLotattResult">
-        <result property="id"    column="id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="zoneId"    column="zone_id"    />
-        <result property="locationNo"    column="location_no"    />
-        <result property="locationBarcode"    column="location_barcode"    />
-        <result property="rowNo"    column="row_no"    />
-        <result property="rowIndex"    column="row_index"    />
-        <result property="colNo"    column="col_no"    />
-        <result property="colIndex"    column="col_index"    />
-        <result property="shiftNo"    column="shift_no"    />
-        <result property="shiftIndex"    column="shift_index"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="isEmpty"    column="is_empty"    />
-        <result property="bindSku"    column="bind_sku"    />
-        <result property="locationType"    column="location_type"    />
-        <result property="rackId"    column="rack_id"    />
-        <result property="agvStation"    column="agv_station"    />
-        <result property="foldedTag"    column="folded_tag"    />
-        <result property="foldedCount"    column="folded_count"    />
-        <result property="userdefine1"    column="userdefine1"    />
-        <result property="userdefine2"    column="userdefine2"    />
-        <result property="userdefine3"    column="userdefine3"    />
-        <result property="userdefine4"    column="userdefine4"    />
-        <result property="userdefine5"    column="userdefine5"    />
-        <result property="userdefine6"    column="userdefine6"    />
-        <result property="userdefine7"    column="userdefine7"    />
-        <result property="userdefine8"    column="userdefine8"    />
-        <result property="userdefine9"    column="userdefine9"    />
-        <result property="userdefine10"    column="userdefine10"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="sku"    column="sku"    />
-        <result property="qty"    column="qty"    />
-        <result property="lotattVO.lotatt01"    column="lotatt01"    />
-        <result property="lotattVO.lotatt02"    column="lotatt02"    />
-        <result property="lotattVO.lotatt03"    column="lotatt03"    />
-        <result property="lotattVO.lotatt04"    column="lotatt04"    />
-        <result property="lotattVO.lotatt05"    column="lotatt05"    />
-        <result property="lotattVO.lotatt06"    column="lotatt06"    />
-        <result property="lotattVO.lotatt07"    column="lotatt07"    />
-        <result property="lotattVO.lotatt08"    column="lotatt08"    />
-        <result property="lotattVO.lotatt09"    column="lotatt09"    />
-        <result property="lotattVO.lotatt10"    column="lotatt10"    />
-        <result property="lotattVO.lotatt11"    column="lotatt11"    />
-        <result property="lotattVO.lotatt12"    column="lotatt12"    />
-        <result property="lotattVO.lotatt13"    column="lotatt13"    />
-        <result property="lotattVO.lotatt14"    column="lotatt14"    />
-        <result property="lotattVO.lotatt15"    column="lotatt15"    />
-        <result property="lotattVO.lotatt16"    column="lotatt16"    />
-        <result property="lotattVO.lotatt17"    column="lotatt17"    />
-        <result property="lotattVO.lotatt18"    column="lotatt18"    />
+        <result property="id" column="id"/>
+        <result property="warehouseId" column="warehouse_id"/>
+        <result property="zoneId" column="zone_id"/>
+        <result property="locationNo" column="location_no"/>
+        <result property="locationBarcode" column="location_barcode"/>
+        <result property="rowNo" column="row_no"/>
+        <result property="rowIndex" column="row_index"/>
+        <result property="colNo" column="col_no"/>
+        <result property="colIndex" column="col_index"/>
+        <result property="shiftNo" column="shift_no"/>
+        <result property="shiftIndex" column="shift_index"/>
+        <result property="stockStatus" column="stock_status"/>
+        <result property="isEmpty" column="is_empty"/>
+        <result property="bindSku" column="bind_sku"/>
+        <result property="locationType" column="location_type"/>
+        <result property="rackId" column="rack_id"/>
+        <result property="agvStation" column="agv_station"/>
+        <result property="foldedTag" column="folded_tag"/>
+        <result property="foldedCount" column="folded_count"/>
+        <result property="userdefine1" column="userdefine1"/>
+        <result property="userdefine2" column="userdefine2"/>
+        <result property="userdefine3" column="userdefine3"/>
+        <result property="userdefine4" column="userdefine4"/>
+        <result property="userdefine5" column="userdefine5"/>
+        <result property="userdefine6" column="userdefine6"/>
+        <result property="userdefine7" column="userdefine7"/>
+        <result property="userdefine8" column="userdefine8"/>
+        <result property="userdefine9" column="userdefine9"/>
+        <result property="userdefine10" column="userdefine10"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="sku" column="sku"/>
+        <result property="qty" column="qty"/>
+        <result property="lotattVO.lotatt01" column="lotatt01"/>
+        <result property="lotattVO.lotatt02" column="lotatt02"/>
+        <result property="lotattVO.lotatt03" column="lotatt03"/>
+        <result property="lotattVO.lotatt04" column="lotatt04"/>
+        <result property="lotattVO.lotatt05" column="lotatt05"/>
+        <result property="lotattVO.lotatt06" column="lotatt06"/>
+        <result property="lotattVO.lotatt07" column="lotatt07"/>
+        <result property="lotattVO.lotatt08" column="lotatt08"/>
+        <result property="lotattVO.lotatt09" column="lotatt09"/>
+        <result property="lotattVO.lotatt10" column="lotatt10"/>
+        <result property="lotattVO.lotatt11" column="lotatt11"/>
+        <result property="lotattVO.lotatt12" column="lotatt12"/>
+        <result property="lotattVO.lotatt13" column="lotatt13"/>
+        <result property="lotattVO.lotatt14" column="lotatt14"/>
+        <result property="lotattVO.lotatt15" column="lotatt15"/>
+        <result property="lotattVO.lotatt16" column="lotatt16"/>
+        <result property="lotattVO.lotatt17" column="lotatt17"/>
+        <result property="lotattVO.lotatt18" column="lotatt18"/>
     </resultMap>
 
     <sql id="selectInvLotLocIdVo">
@@ -129,11 +130,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInvLotLocIdList" parameterType="InvLotLocId" resultMap="InvLotLocIdResult">
         <include refid="selectInvLotLocIdVo"/>
         <where>
-            <if test="locationId != null  and locationId != ''"> and location_id = #{locationId}</if>
-            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
-            <if test="sku != null  and sku != ''"> and sku = #{sku}</if>
-            <if test="lotnum != null  and lotnum != ''"> and lotnum = #{lotnum}</if>
-            <if test="traceid != null  and traceid != ''"> and traceid = #{traceid}</if>
+            <if test="locationId != null  and locationId != ''">and location_id = #{locationId}</if>
+            <if test="customerId != null  and customerId != ''">and customer_id = #{customerId}</if>
+            <if test="sku != null  and sku != ''">and sku = #{sku}</if>
+            <if test="lotnum != null  and lotnum != ''">and lotnum = #{lotnum}</if>
+            <if test="traceid != null  and traceid != ''">and traceid = #{traceid}</if>
         </where>
     </select>
 
@@ -178,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="lotnum != null">#{lotnum},</if>
             <if test="locationId != null">#{locationId},</if>
@@ -200,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateInvLotLocId" parameterType="InvLotLocId">
@@ -261,21 +262,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectInvLocationList" resultMap="BaseLocationInfoLotattResult">
         select
-        b.id, b.warehouse_id, b.zone_id, b.location_no, b.location_barcode, b.row_no, b.row_index, b.col_no, b.col_index, b.shift_no,
-        b.shift_index, b.stock_status, b.is_empty, b.bind_sku, b.location_type,  b.rack_id,  b.agv_station,  b.folded_tag,  b.folded_count,
-        b.userdefine1, b.userdefine2, b.userdefine3, b.userdefine4,  b.userdefine5,  b.userdefine6,  b.userdefine7,  b.userdefine8,
-        b.userdefine9, b.userdefine10, b.create_by, b.create_time,  b.update_by,  b.update_time,  b.remark, inv.sku, inv.qty, att.*
+        b.id, b.warehouse_id, b.zone_id, b.location_no, b.location_barcode, b.row_no, b.row_index, b.col_no,
+        b.col_index, b.shift_no,
+        b.shift_index, b.stock_status, b.is_empty, b.bind_sku, b.location_type, b.rack_id, b.agv_station, b.folded_tag,
+        b.folded_count,
+        b.userdefine1, b.userdefine2, b.userdefine3, b.userdefine4, b.userdefine5, b.userdefine6, b.userdefine7,
+        b.userdefine8,
+        b.userdefine9, b.userdefine10, b.create_by, b.create_time, b.update_by, b.update_time, b.remark, inv.sku,
+        inv.qty, att.*
         from inv_lot_loc_id inv
         left join inv_lot_att att on inv.lotnum = att.lotnum
         left join base_location_info b on inv.location_id = b.id
         left join base_sku sk on inv.sku = sk.sku
         left join base_sku_type skt on sk.sku_type = skt.item_code
         <where>
-            <if test="zoneId != null  and zoneId != ''"> and b.zone_id = #{zoneId}</if>
-            <if test="sku != null  and sku != ''"> and sk.sku = #{sku}</if>
-            <if test="skuType != null  and skuType != ''"> and skt.item_code = #{skuType}</if>
+            <if test="zoneId != null  and zoneId != ''">and b.zone_id = #{zoneId}</if>
+            <if test="sku != null  and sku != ''">and sk.sku = #{sku}</if>
+            <if test="skuType != null  and skuType != ''">and skt.item_code = #{skuType}</if>
         </where>
-        order by lpad(b.row_no, 11, '0'),b.row_index,lpad(b.shift_no, 11, '0'),b.shift_index,lpad(b.col_no, 11, '0'),b.col_index desc
+        order by lpad(b.row_no, 11, '0'),b.row_index,lpad(b.shift_no, 11, '0'),b.shift_index,lpad(b.col_no, 11,
+        '0'),b.col_index desc
     </select>
 
     <select id="selectInvZoneBySkuLotatt" resultMap="BaseLocationInfoLotattResult">
@@ -288,27 +294,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_sku_type skt on sk.sku_type = skt.item_code
         left join base_location_zone bz on b.zone_id = bz.zone_id
         <where>
-            <if test="sku != null  and sku != ''"> and sk.sku = #{sku}</if>
-            <if test="skuType != null  and skuType != ''"> and skt.item_code = #{skuType}</if>
+            <if test="sku != null  and sku != ''">and sk.sku = #{sku}</if>
+            <if test="skuType != null  and skuType != ''">and skt.item_code = #{skuType}</if>
             <if test="lotattDTO != null">
-                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''"> and att.lotatt01 = #{lotattDTO.lotatt01}</if>
-                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''"> and att.lotatt02 = #{lotattDTO.lotatt02}</if>
-                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''"> and att.lotatt03 = #{lotattDTO.lotatt03}</if>
-                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''"> and att.lotatt04 = #{lotattDTO.lotatt04}</if>
-                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''"> and att.lotatt05 = #{lotattDTO.lotatt05}</if>
-                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''"> and att.lotatt06 = #{lotattDTO.lotatt06}</if>
-                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''"> and att.lotatt07 = #{lotattDTO.lotatt07}</if>
-                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''"> and att.lotatt08 = #{lotattDTO.lotatt08}</if>
-                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''"> and att.lotatt09 = #{lotattDTO.lotatt09}</if>
-                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''"> and att.lotatt10 = #{lotattDTO.lotatt10}</if>
-                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''"> and att.lotatt11 = #{lotattDTO.lotatt11}</if>
-                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''"> and att.lotatt12 = #{lotattDTO.lotatt12}</if>
-                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''"> and att.lotatt13 = #{lotattDTO.lotatt13}</if>
-                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''"> and att.lotatt14 = #{lotattDTO.lotatt14}</if>
-                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''"> and att.lotatt15 = #{lotattDTO.lotatt15}</if>
-                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''"> and att.lotatt16 = #{lotattDTO.lotatt16}</if>
-                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''"> and att.lotatt17 = #{lotattDTO.lotatt17}</if>
-                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''"> and att.lotatt18 = #{lotattDTO.lotatt18}</if>
+                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''">and att.lotatt01 =
+                    #{lotattDTO.lotatt01}
+                </if>
+                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''">and att.lotatt02 =
+                    #{lotattDTO.lotatt02}
+                </if>
+                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''">and att.lotatt03 =
+                    #{lotattDTO.lotatt03}
+                </if>
+                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''">and att.lotatt04 =
+                    #{lotattDTO.lotatt04}
+                </if>
+                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''">and att.lotatt05 =
+                    #{lotattDTO.lotatt05}
+                </if>
+                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''">and att.lotatt06 =
+                    #{lotattDTO.lotatt06}
+                </if>
+                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''">and att.lotatt07 =
+                    #{lotattDTO.lotatt07}
+                </if>
+                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''">and att.lotatt08 =
+                    #{lotattDTO.lotatt08}
+                </if>
+                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''">and att.lotatt09 =
+                    #{lotattDTO.lotatt09}
+                </if>
+                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''">and att.lotatt10 =
+                    #{lotattDTO.lotatt10}
+                </if>
+                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''">and att.lotatt11 =
+                    #{lotattDTO.lotatt11}
+                </if>
+                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''">and att.lotatt12 =
+                    #{lotattDTO.lotatt12}
+                </if>
+                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''">and att.lotatt13 =
+                    #{lotattDTO.lotatt13}
+                </if>
+                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''">and att.lotatt14 =
+                    #{lotattDTO.lotatt14}
+                </if>
+                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''">and att.lotatt15 =
+                    #{lotattDTO.lotatt15}
+                </if>
+                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''">and att.lotatt16 =
+                    #{lotattDTO.lotatt16}
+                </if>
+                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''">and att.lotatt17 =
+                    #{lotattDTO.lotatt17}
+                </if>
+                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''">and att.lotatt18 =
+                    #{lotattDTO.lotatt18}
+                </if>
             </if>
         </where>
         and bz.userdefine1 = 'INV'
@@ -324,7 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_sku sk on inv.sku = sk.sku
         <where>
             1=1
-            <if test="zoneId != null  and zoneId != ''"> and b.zone_id = #{zoneId}</if>
+            <if test="zoneId != null  and zoneId != ''">and b.zone_id = #{zoneId}</if>
         </where>
         group by att.lotatt01
         order by att.lotatt01
@@ -332,7 +374,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectInvLocIdLotattList" resultMap="InvLotLocIdLotattResult">
         select
-        inv.location_id,sk.sku,sk.desc1 sku_name,sk.model sku_model,skt.item_name sku_type_name,b.location_no,inv.qty,inv.qtyallocated
+        inv.location_id,sk.sku,sk.desc1 sku_name,sk.model sku_model,skt.item_name
+        sku_type_name,b.location_no,inv.qty,inv.qtyallocated
         ,att.lotnum, att.customer_id,w.box_no,w.is_full
         ,b.zone_id,b.stock_status stockStatus,b.is_empty isEmpty,z.zone_name
         ,lotatt01, lotatt02, lotatt03, lotatt04,lot05_dict.dict_label lotatt05, supp.supplier_name lotatt06
@@ -344,43 +387,82 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_location_zone z on b.zone_id = z.zone_id
         left join base_sku sk on inv.sku = sk.sku
         left join base_sku_type skt on sk.sku_type = skt.item_code
-        left join (select dict_label,dict_value from sys_dict_data where dict_type = 'ams_inv_quality') lot05_dict on att.lotatt05 = lot05_dict.dict_value
+        left join (select dict_label,dict_value from sys_dict_data where dict_type = 'ams_inv_quality') lot05_dict on
+        att.lotatt05 = lot05_dict.dict_value
         left join (select * from base_supplier) supp on att.lotatt06 = supp.supplier_id
-        left join  wms_box_info w on att.lotatt07 = w.box_no
+        left join wms_box_info w on att.lotatt07 = w.box_no
         <where>
-            <if test="zoneId != null  and zoneId != ''"> and b.zone_id = #{zoneId}</if>
-            <if test="sku != null  and sku != ''"> and inv.sku = #{sku}</if>
-            <if test="lotnum != null  and lotnum != ''"> and inv.lotnum = #{lotnum}</if>
-            <if test="locationId != null  and locationId != ''"> and inv.location_id = #{locationId}</if>
-            <if test="locationNo != null  and locationNo != ''"> and b.location_no like concat('%', #{locationNo}, '%')</if>
-            <if test="isFull != null  and isFull != ''"> and w.is_full = #{isFull}</if>
+            <if test="zoneId != null  and zoneId != ''">and b.zone_id = #{zoneId}</if>
+            <if test="sku != null  and sku != ''">and inv.sku = #{sku}</if>
+            <if test="lotnum != null  and lotnum != ''">and inv.lotnum = #{lotnum}</if>
+            <if test="locationId != null  and locationId != ''">and inv.location_id = #{locationId}</if>
+            <if test="locationNo != null  and locationNo != ''">and b.location_no like concat('%', #{locationNo}, '%')
+            </if>
+            <if test="isFull != null  and isFull != ''">and w.is_full = #{isFull}</if>
             <if test="lotattDTO != null">
-                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''"> and att.lotatt01 = #{lotattDTO.lotatt01}</if>
-                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''"> and att.lotatt02 = #{lotattDTO.lotatt02}</if>
-                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''"> and att.lotatt03 = #{lotattDTO.lotatt03}</if>
-                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''"> and att.lotatt04 = #{lotattDTO.lotatt04}</if>
-                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''"> and att.lotatt05 = #{lotattDTO.lotatt05}</if>
-                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''"> and att.lotatt06 = #{lotattDTO.lotatt06}</if>
-                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''"> and att.lotatt07 = #{lotattDTO.lotatt07}</if>
-                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''"> and att.lotatt08 = #{lotattDTO.lotatt08}</if>
-                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''"> and att.lotatt09 = #{lotattDTO.lotatt09}</if>
-                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''"> and att.lotatt10 = #{lotattDTO.lotatt10}</if>
-                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''"> and att.lotatt11 = #{lotattDTO.lotatt11}</if>
-                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''"> and att.lotatt12 = #{lotattDTO.lotatt12}</if>
-                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''"> and att.lotatt13 = #{lotattDTO.lotatt13}</if>
-                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''"> and att.lotatt14 = #{lotattDTO.lotatt14}</if>
-                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''"> and att.lotatt15 = #{lotattDTO.lotatt15}</if>
-                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''"> and att.lotatt16 = #{lotattDTO.lotatt16}</if>
-                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''"> and att.lotatt17 = #{lotattDTO.lotatt17}</if>
-                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''"> and att.lotatt18 = #{lotattDTO.lotatt18}</if>
+                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''">and att.lotatt01 =
+                    #{lotattDTO.lotatt01}
+                </if>
+                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''">and att.lotatt02 =
+                    #{lotattDTO.lotatt02}
+                </if>
+                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''">and att.lotatt03 =
+                    #{lotattDTO.lotatt03}
+                </if>
+                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''">and att.lotatt04 =
+                    #{lotattDTO.lotatt04}
+                </if>
+                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''">and att.lotatt05 =
+                    #{lotattDTO.lotatt05}
+                </if>
+                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''">and att.lotatt06 =
+                    #{lotattDTO.lotatt06}
+                </if>
+                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''">and att.lotatt07 =
+                    #{lotattDTO.lotatt07}
+                </if>
+                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''">and att.lotatt08 =
+                    #{lotattDTO.lotatt08}
+                </if>
+                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''">and att.lotatt09 =
+                    #{lotattDTO.lotatt09}
+                </if>
+                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''">and att.lotatt10 =
+                    #{lotattDTO.lotatt10}
+                </if>
+                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''">and att.lotatt11 =
+                    #{lotattDTO.lotatt11}
+                </if>
+                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''">and att.lotatt12 =
+                    #{lotattDTO.lotatt12}
+                </if>
+                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''">and att.lotatt13 =
+                    #{lotattDTO.lotatt13}
+                </if>
+                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''">and att.lotatt14 =
+                    #{lotattDTO.lotatt14}
+                </if>
+                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''">and att.lotatt15 =
+                    #{lotattDTO.lotatt15}
+                </if>
+                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''">and att.lotatt16 =
+                    #{lotattDTO.lotatt16}
+                </if>
+                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''">and att.lotatt17 =
+                    #{lotattDTO.lotatt17}
+                </if>
+                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''">and att.lotatt18 =
+                    #{lotattDTO.lotatt18}
+                </if>
             </if>
         </where>
-        order by lpad(b.row_no, 11, '0'),b.row_index,lpad(b.shift_no, 11, '0'),b.shift_index,lpad(b.col_no, 11, '0'),b.col_index desc
+        order by lpad(b.row_no, 11, '0'),b.row_index,lpad(b.shift_no, 11, '0'),b.shift_index,lpad(b.col_no, 11,
+        '0'),b.col_index desc
     </select>
 
     <select id="selectInvLocIdLotattByLocationId" resultMap="InvLotLocIdLotattResult">
         select
-            inv.location_id,sk.sku,sk.desc1 sku_name,b.location_no,inv.qty,inv.qtyallocated
+            inv.location_id,sk.sku,sk.specs,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
@@ -410,7 +492,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where location_id = #{locationFrom}
     </update>
 
-    <update id="moveInvByLocationId"  parameterType="Object">
+    <update id="moveInvByLocationId" parameterType="Object">
         update inv_lot_loc_id
         set location_id = #{locationTo},traceid = #{traceid}
        where location_id = #{locationFrom}
@@ -449,29 +531,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_sku_type skt on sk.sku_type = skt.item_code
         left join base_location_zone bz on b.zone_id = bz.zone_id
         <where>
-            <if test="sku != null  and sku != ''"> and sk.sku = #{sku}</if>
+            <if test="sku != null  and sku != ''">and sk.sku = #{sku}</if>
             <if test="lotattDTO != null">
-                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''"> and att.lotatt01 = #{lotattDTO.lotatt01}</if>
-                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''"> and att.lotatt02 = #{lotattDTO.lotatt02}</if>
-                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''"> and att.lotatt03 = #{lotattDTO.lotatt03}</if>
-                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''"> and att.lotatt04 = #{lotattDTO.lotatt04}</if>
-                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''"> and att.lotatt05 = #{lotattDTO.lotatt05}</if>
-                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''"> and att.lotatt06 = #{lotattDTO.lotatt06}</if>
-                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''"> and att.lotatt07 = #{lotattDTO.lotatt07}</if>
-                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''"> and att.lotatt08 = #{lotattDTO.lotatt08}</if>
-                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''"> and att.lotatt09 = #{lotattDTO.lotatt09}</if>
-                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''"> and att.lotatt10 = #{lotattDTO.lotatt10}</if>
-                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''"> and att.lotatt11 = #{lotattDTO.lotatt11}</if>
-                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''"> and att.lotatt12 = #{lotattDTO.lotatt12}</if>
-                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''"> and att.lotatt13 = #{lotattDTO.lotatt13}</if>
-                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''"> and att.lotatt14 = #{lotattDTO.lotatt14}</if>
-                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''"> and att.lotatt15 = #{lotattDTO.lotatt15}</if>
-                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''"> and att.lotatt16 = #{lotattDTO.lotatt16}</if>
-                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''"> and att.lotatt17 = #{lotattDTO.lotatt17}</if>
-                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''"> and att.lotatt18 = #{lotattDTO.lotatt18}</if>
+                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''">and att.lotatt01 =
+                    #{lotattDTO.lotatt01}
+                </if>
+                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''">and att.lotatt02 =
+                    #{lotattDTO.lotatt02}
+                </if>
+                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''">and att.lotatt03 =
+                    #{lotattDTO.lotatt03}
+                </if>
+                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''">and att.lotatt04 =
+                    #{lotattDTO.lotatt04}
+                </if>
+                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''">and att.lotatt05 =
+                    #{lotattDTO.lotatt05}
+                </if>
+                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''">and att.lotatt06 =
+                    #{lotattDTO.lotatt06}
+                </if>
+                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''">and att.lotatt07 =
+                    #{lotattDTO.lotatt07}
+                </if>
+                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''">and att.lotatt08 =
+                    #{lotattDTO.lotatt08}
+                </if>
+                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''">and att.lotatt09 =
+                    #{lotattDTO.lotatt09}
+                </if>
+                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''">and att.lotatt10 =
+                    #{lotattDTO.lotatt10}
+                </if>
+                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''">and att.lotatt11 =
+                    #{lotattDTO.lotatt11}
+                </if>
+                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''">and att.lotatt12 =
+                    #{lotattDTO.lotatt12}
+                </if>
+                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''">and att.lotatt13 =
+                    #{lotattDTO.lotatt13}
+                </if>
+                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''">and att.lotatt14 =
+                    #{lotattDTO.lotatt14}
+                </if>
+                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''">and att.lotatt15 =
+                    #{lotattDTO.lotatt15}
+                </if>
+                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''">and att.lotatt16 =
+                    #{lotattDTO.lotatt16}
+                </if>
+                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''">and att.lotatt17 =
+                    #{lotattDTO.lotatt17}
+                </if>
+                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''">and att.lotatt18 =
+                    #{lotattDTO.lotatt18}
+                </if>
             </if>
-            and bz.zone_id  in
-            <foreach  item="item" index="index" collection="zoneIdList" open="(" separator="," close=" )">
+            and bz.zone_id in
+            <foreach item="item" index="index" collection="zoneIdList" open="(" separator="," close=" )">
                 #{item}
             </foreach>
             group by sk.sku
@@ -488,26 +606,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_sku_type skt on sk.sku_type = skt.item_code
         left join base_location_zone bz on b.zone_id = bz.zone_id
         <where>
-            <if test="sku != null  and sku != ''"> and sk.sku = #{sku}</if>
+            <if test="sku != null  and sku != ''">and sk.sku = #{sku}</if>
             <if test="lotattDTO != null">
-                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''"> and att.lotatt01 = #{lotattDTO.lotatt01}</if>
-                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''"> and att.lotatt02 = #{lotattDTO.lotatt02}</if>
-                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''"> and att.lotatt03 = #{lotattDTO.lotatt03}</if>
-                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''"> and att.lotatt04 = #{lotattDTO.lotatt04}</if>
-                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''"> and att.lotatt05 = #{lotattDTO.lotatt05}</if>
-                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''"> and att.lotatt06 = #{lotattDTO.lotatt06}</if>
-                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''"> and att.lotatt07 = #{lotattDTO.lotatt07}</if>
-                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''"> and att.lotatt08 = #{lotattDTO.lotatt08}</if>
-                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''"> and att.lotatt09 = #{lotattDTO.lotatt09}</if>
-                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''"> and att.lotatt10 = #{lotattDTO.lotatt10}</if>
-                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''"> and att.lotatt11 = #{lotattDTO.lotatt11}</if>
-                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''"> and att.lotatt12 = #{lotattDTO.lotatt12}</if>
-                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''"> and att.lotatt13 = #{lotattDTO.lotatt13}</if>
-                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''"> and att.lotatt14 = #{lotattDTO.lotatt14}</if>
-                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''"> and att.lotatt15 = #{lotattDTO.lotatt15}</if>
-                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''"> and att.lotatt16 = #{lotattDTO.lotatt16}</if>
-                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''"> and att.lotatt17 = #{lotattDTO.lotatt17}</if>
-                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''"> and att.lotatt18 = #{lotattDTO.lotatt18}</if>
+                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''">and att.lotatt01 =
+                    #{lotattDTO.lotatt01}
+                </if>
+                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''">and att.lotatt02 =
+                    #{lotattDTO.lotatt02}
+                </if>
+                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''">and att.lotatt03 =
+                    #{lotattDTO.lotatt03}
+                </if>
+                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''">and att.lotatt04 =
+                    #{lotattDTO.lotatt04}
+                </if>
+                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''">and att.lotatt05 =
+                    #{lotattDTO.lotatt05}
+                </if>
+                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''">and att.lotatt06 =
+                    #{lotattDTO.lotatt06}
+                </if>
+                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''">and att.lotatt07 =
+                    #{lotattDTO.lotatt07}
+                </if>
+                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''">and att.lotatt08 =
+                    #{lotattDTO.lotatt08}
+                </if>
+                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''">and att.lotatt09 =
+                    #{lotattDTO.lotatt09}
+                </if>
+                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''">and att.lotatt10 =
+                    #{lotattDTO.lotatt10}
+                </if>
+                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''">and att.lotatt11 =
+                    #{lotattDTO.lotatt11}
+                </if>
+                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''">and att.lotatt12 =
+                    #{lotattDTO.lotatt12}
+                </if>
+                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''">and att.lotatt13 =
+                    #{lotattDTO.lotatt13}
+                </if>
+                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''">and att.lotatt14 =
+                    #{lotattDTO.lotatt14}
+                </if>
+                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''">and att.lotatt15 =
+                    #{lotattDTO.lotatt15}
+                </if>
+                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''">and att.lotatt16 =
+                    #{lotattDTO.lotatt16}
+                </if>
+                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''">and att.lotatt17 =
+                    #{lotattDTO.lotatt17}
+                </if>
+                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''">and att.lotatt18 =
+                    #{lotattDTO.lotatt18}
+                </if>
             </if>
             and b.id = #{locationId}
             group by sk.sku
@@ -516,38 +670,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryInvOrderBy" parameterType="object" resultType="invLotLocIdForm">
         select inv.lotnum, inv.location_id locationId, inv.traceid, inv.customer_id customerId
-             , inv.sku, inv.qty, inv.qty_each qtyEach, inv.qtyallocated, inv.qtyallocated_each qtyallocatedEach
-            ,att.lotatt01,att.lotatt02,att.lotatt03,att.lotatt04,att.lotatt05,att.lotatt06,att.lotatt07,att.lotatt08,att.lotatt09
-             ,att.lotatt10,att.lotatt11,att.lotatt12,att.lotatt13,att.lotatt14,att.lotatt15,att.lotatt16,att.lotatt17,att.lotatt18
+        , inv.sku, inv.qty, inv.qty_each qtyEach, inv.qtyallocated, inv.qtyallocated_each qtyallocatedEach
+        ,att.lotatt01,att.lotatt02,att.lotatt03,att.lotatt04,att.lotatt05,att.lotatt06,att.lotatt07,att.lotatt08,att.lotatt09
+        ,att.lotatt10,att.lotatt11,att.lotatt12,att.lotatt13,att.lotatt14,att.lotatt15,att.lotatt16,att.lotatt17,att.lotatt18
         ,t3.orderByQty
         from inv_lot_loc_id inv
         left join base_location_info b on inv.location_id = b.id
         left join inv_lot_att att on inv.lotnum = att.lotnum
-        LEFT JOIN (SELECT t1.location_id,t1.sku,count(qty) orderByQty from inv_lot_loc_id t1 where t1.sku = #{sku} GROUP BY t1.location_id,t1.sku) t3 on t3.location_id = inv.location_id
+        LEFT JOIN (SELECT t1.location_id,t1.sku,count(qty) orderByQty from inv_lot_loc_id t1 where t1.sku = #{sku} GROUP
+        BY t1.location_id,t1.sku) t3 on t3.location_id = inv.location_id
         <where>
-            <if test="lotnum != null  and lotnum != ''"> and inv.lotnum = #{lotnum}</if>
-            <if test="sku != null  and sku != ''"> and inv.sku = #{sku}</if>
-            <if test="location != null  and location != ''"> and inv.location_id = #{location}</if>
-            <if test="customerId != null  and customerId != ''"> and inv.customer_id = #{customerId}</if>
+            <if test="lotnum != null  and lotnum != ''">and inv.lotnum = #{lotnum}</if>
+            <if test="sku != null  and sku != ''">and inv.sku = #{sku}</if>
+            <if test="location != null  and location != ''">and inv.location_id = #{location}</if>
+            <if test="customerId != null  and customerId != ''">and inv.customer_id = #{customerId}</if>
             <if test="lotattDTO != null">
-                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''"> and att.lotatt01 = #{lotattDTO.lotatt01}</if>
-                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''"> and att.lotatt02 = #{lotattDTO.lotatt02}</if>
-                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''"> and att.lotatt03 = #{lotattDTO.lotatt03}</if>
-                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''"> and att.lotatt04 = #{lotattDTO.lotatt04}</if>
-                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''"> and att.lotatt05 = #{lotattDTO.lotatt05}</if>
-                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''"> and att.lotatt06 = #{lotattDTO.lotatt06}</if>
-                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''"> and att.lotatt07 = #{lotattDTO.lotatt07}</if>
-                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''"> and att.lotatt08 = #{lotattDTO.lotatt08}</if>
-                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''"> and att.lotatt09 = #{lotattDTO.lotatt09}</if>
-                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''"> and att.lotatt10 = #{lotattDTO.lotatt10}</if>
-                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''"> and att.lotatt11 = #{lotattDTO.lotatt11}</if>
-                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''"> and att.lotatt12 = #{lotattDTO.lotatt12}</if>
-                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''"> and att.lotatt13 = #{lotattDTO.lotatt13}</if>
-                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''"> and (att.lotatt14 = #{lotattDTO.lotatt14} or att.lotatt14 is null)</if>
-                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''"> and att.lotatt15 = #{lotattDTO.lotatt15}</if>
-                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''"> and att.lotatt16 = #{lotattDTO.lotatt16}</if>
-                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''"> and att.lotatt17 = #{lotattDTO.lotatt17}</if>
-                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''"> and att.lotatt18 = #{lotattDTO.lotatt18}</if>
+                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''">and att.lotatt01 =
+                    #{lotattDTO.lotatt01}
+                </if>
+                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''">and att.lotatt02 =
+                    #{lotattDTO.lotatt02}
+                </if>
+                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''">and att.lotatt03 =
+                    #{lotattDTO.lotatt03}
+                </if>
+                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''">and att.lotatt04 =
+                    #{lotattDTO.lotatt04}
+                </if>
+                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''">and att.lotatt05 =
+                    #{lotattDTO.lotatt05}
+                </if>
+                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''">and att.lotatt06 =
+                    #{lotattDTO.lotatt06}
+                </if>
+                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''">and att.lotatt07 =
+                    #{lotattDTO.lotatt07}
+                </if>
+                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''">and att.lotatt08 =
+                    #{lotattDTO.lotatt08}
+                </if>
+                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''">and att.lotatt09 =
+                    #{lotattDTO.lotatt09}
+                </if>
+                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''">and att.lotatt10 =
+                    #{lotattDTO.lotatt10}
+                </if>
+                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''">and att.lotatt11 =
+                    #{lotattDTO.lotatt11}
+                </if>
+                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''">and att.lotatt12 =
+                    #{lotattDTO.lotatt12}
+                </if>
+                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''">and att.lotatt13 =
+                    #{lotattDTO.lotatt13}
+                </if>
+                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''">and (att.lotatt14 =
+                    #{lotattDTO.lotatt14} or att.lotatt14 is null)
+                </if>
+                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''">and att.lotatt15 =
+                    #{lotattDTO.lotatt15}
+                </if>
+                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''">and att.lotatt16 =
+                    #{lotattDTO.lotatt16}
+                </if>
+                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''">and att.lotatt17 =
+                    #{lotattDTO.lotatt17}
+                </if>
+                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''">and att.lotatt18 =
+                    #{lotattDTO.lotatt18}
+                </if>
             </if>
             and b.stock_status = '00' and b.zone_id = '2'
         </where>
@@ -560,53 +751,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join inv_lot_att att on li.lotnum = att.lotnum
         <where>
             <if test="lotattDTO != null">
-                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''"> and att.lotatt01 = #{lotattDTO.lotatt01}</if>
-                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''"> and att.lotatt02 = #{lotattDTO.lotatt02}</if>
-                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''"> and att.lotatt03 = #{lotattDTO.lotatt03}</if>
-                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''"> and att.lotatt04 = #{lotattDTO.lotatt04}</if>
-                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''"> and att.lotatt05 = #{lotattDTO.lotatt05}</if>
-                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''"> and att.lotatt06 = #{lotattDTO.lotatt06}</if>
-                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''"> and att.lotatt07 = #{lotattDTO.lotatt07}</if>
-                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''"> and att.lotatt08 = #{lotattDTO.lotatt08}</if>
-                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''"> and att.lotatt09 = #{lotattDTO.lotatt09}</if>
-                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''"> and att.lotatt10 = #{lotattDTO.lotatt10}</if>
-                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''"> and att.lotatt11 = #{lotattDTO.lotatt11}</if>
-                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''"> and att.lotatt12 = #{lotattDTO.lotatt12}</if>
-                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''"> and att.lotatt13 = #{lotattDTO.lotatt13}</if>
-                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''"> and att.lotatt14 = #{lotattDTO.lotatt14}</if>
-                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''"> and att.lotatt15 = #{lotattDTO.lotatt15}</if>
-                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''"> and att.lotatt16 = #{lotattDTO.lotatt16}</if>
-                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''"> and att.lotatt17 = #{lotattDTO.lotatt17}</if>
-                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''"> and att.lotatt18 = #{lotattDTO.lotatt18}</if>
+                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''">and att.lotatt01 =
+                    #{lotattDTO.lotatt01}
+                </if>
+                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''">and att.lotatt02 =
+                    #{lotattDTO.lotatt02}
+                </if>
+                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''">and att.lotatt03 =
+                    #{lotattDTO.lotatt03}
+                </if>
+                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''">and att.lotatt04 =
+                    #{lotattDTO.lotatt04}
+                </if>
+                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''">and att.lotatt05 =
+                    #{lotattDTO.lotatt05}
+                </if>
+                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''">and att.lotatt06 =
+                    #{lotattDTO.lotatt06}
+                </if>
+                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''">and att.lotatt07 =
+                    #{lotattDTO.lotatt07}
+                </if>
+                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''">and att.lotatt08 =
+                    #{lotattDTO.lotatt08}
+                </if>
+                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''">and att.lotatt09 =
+                    #{lotattDTO.lotatt09}
+                </if>
+                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''">and att.lotatt10 =
+                    #{lotattDTO.lotatt10}
+                </if>
+                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''">and att.lotatt11 =
+                    #{lotattDTO.lotatt11}
+                </if>
+                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''">and att.lotatt12 =
+                    #{lotattDTO.lotatt12}
+                </if>
+                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''">and att.lotatt13 =
+                    #{lotattDTO.lotatt13}
+                </if>
+                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''">and att.lotatt14 =
+                    #{lotattDTO.lotatt14}
+                </if>
+                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''">and att.lotatt15 =
+                    #{lotattDTO.lotatt15}
+                </if>
+                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''">and att.lotatt16 =
+                    #{lotattDTO.lotatt16}
+                </if>
+                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''">and att.lotatt17 =
+                    #{lotattDTO.lotatt17}
+                </if>
+                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''">and att.lotatt18 =
+                    #{lotattDTO.lotatt18}
+                </if>
             </if>
         </where>
     </select>
 
     <select id="queryInvLotattByInvLotatt" resultMap="InvLotLocIdLotattResult">
-        select li.*,att.lotatt01,att.lotatt02,att.lotatt03,att.lotatt04,att.lotatt05,att.lotatt06,att.lotatt07,att.lotatt08,att.lotatt09
-             ,att.lotatt10,att.lotatt11,att.lotatt12,att.lotatt13,att.lotatt14,att.lotatt15,att.lotatt16,att.lotatt17,att.lotatt18
+        select
+        li.*,att.lotatt01,att.lotatt02,att.lotatt03,att.lotatt04,att.lotatt05,att.lotatt06,att.lotatt07,att.lotatt08,att.lotatt09
+        ,att.lotatt10,att.lotatt11,att.lotatt12,att.lotatt13,att.lotatt14,att.lotatt15,att.lotatt16,att.lotatt17,att.lotatt18
         from inv_lot_loc_id li
         left join inv_lot_att att on li.lotnum = att.lotnum
         <where>
-                <if test="sku != null  and sku != ''"> and li.sku = #{sku}</if>
-                <if test="lotatt01 != null  and lotatt01 != ''"> and att.lotatt01 = #{lotatt01}</if>
-                <if test="lotatt02 != null  and lotatt02 != ''"> and att.lotatt02 = #{lotatt02}</if>
-                <if test="lotatt03 != null  and lotatt03 != ''"> and att.lotatt03 = #{lotatt03}</if>
-                <if test="lotatt04 != null  and lotatt04 != ''"> and att.lotatt04 = #{lotatt04}</if>
-                <if test="lotatt05 != null  and lotatt05 != ''"> and att.lotatt05 = #{lotatt05}</if>
-                <if test="lotatt06 != null  and lotatt06 != ''"> and att.lotatt06 = #{lotatt06}</if>
-                <if test="lotatt07 != null  and lotatt07 != ''"> and att.lotatt07 = #{lotatt07}</if>
-                <if test="lotatt08 != null  and lotatt08 != ''"> and INSTR(#{lotatt08}, att.lotatt08)</if>
-                <if test="lotatt09 != null  and lotatt09 != ''"> and att.lotatt09 = #{lotatt09}</if>
-                <if test="lotatt10 != null  and lotatt10 != ''"> and att.lotatt10 = #{lotatt10}</if>
-                <if test="lotatt11 != null  and lotatt11 != ''"> and att.lotatt11 = #{lotatt11}</if>
-                <if test="lotatt12 != null  and lotatt12 != ''"> and att.lotatt12 = #{lotatt12}</if>
-                <if test="lotatt13 != null  and lotatt13 != ''"> and att.lotatt13 = #{lotatt13}</if>
-                <if test="lotatt14 != null  and lotatt14 != ''"> and att.lotatt14 = #{lotatt14}</if>
-                <if test="lotatt15 != null  and lotatt15 != ''"> and att.lotatt15 = #{lotatt15}</if>
-                <if test="lotatt16 != null  and lotatt16 != ''"> and att.lotatt16 = #{lotatt16}</if>
-                <if test="lotatt17 != null  and lotatt17 != ''"> and att.lotatt17 = #{lotatt17}</if>
-                <if test="lotatt18 != null  and lotatt18 != ''"> and att.lotatt18 = #{lotatt18}</if>
+            <if test="sku != null  and sku != ''">and li.sku = #{sku}</if>
+            <if test="lotatt01 != null  and lotatt01 != ''">and att.lotatt01 = #{lotatt01}</if>
+            <if test="lotatt02 != null  and lotatt02 != ''">and att.lotatt02 = #{lotatt02}</if>
+            <if test="lotatt03 != null  and lotatt03 != ''">and att.lotatt03 = #{lotatt03}</if>
+            <if test="lotatt04 != null  and lotatt04 != ''">and att.lotatt04 = #{lotatt04}</if>
+            <if test="lotatt05 != null  and lotatt05 != ''">and att.lotatt05 = #{lotatt05}</if>
+            <if test="lotatt06 != null  and lotatt06 != ''">and att.lotatt06 = #{lotatt06}</if>
+            <if test="lotatt07 != null  and lotatt07 != ''">and att.lotatt07 = #{lotatt07}</if>
+            <if test="lotatt08 != null  and lotatt08 != ''">and INSTR(#{lotatt08}, att.lotatt08)</if>
+            <if test="lotatt09 != null  and lotatt09 != ''">and att.lotatt09 = #{lotatt09}</if>
+            <if test="lotatt10 != null  and lotatt10 != ''">and att.lotatt10 = #{lotatt10}</if>
+            <if test="lotatt11 != null  and lotatt11 != ''">and att.lotatt11 = #{lotatt11}</if>
+            <if test="lotatt12 != null  and lotatt12 != ''">and att.lotatt12 = #{lotatt12}</if>
+            <if test="lotatt13 != null  and lotatt13 != ''">and att.lotatt13 = #{lotatt13}</if>
+            <if test="lotatt14 != null  and lotatt14 != ''">and att.lotatt14 = #{lotatt14}</if>
+            <if test="lotatt15 != null  and lotatt15 != ''">and att.lotatt15 = #{lotatt15}</if>
+            <if test="lotatt16 != null  and lotatt16 != ''">and att.lotatt16 = #{lotatt16}</if>
+            <if test="lotatt17 != null  and lotatt17 != ''">and att.lotatt17 = #{lotatt17}</if>
+            <if test="lotatt18 != null  and lotatt18 != ''">and att.lotatt18 = #{lotatt18}</if>
         </where>
     </select>
 
@@ -672,9 +900,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInvLotLocIdBySkuLocationSort" resultMap="InvLotLocIdResult">
         select *,(qtyallocated - qty) qty from inv_lot_loc_id
         <where>
-            <if test="locationId != null  and locationId != ''"> and location_id = #{locationId}</if>
-            <if test="sku != null  and sku != ''"> and sku = #{sku}</if>
+            <if test="locationId != null  and locationId != ''">and location_id = #{locationId}</if>
+            <if test="sku != null  and sku != ''">and sku = #{sku}</if>
         </where>
         order by (qtyallocated - qty)
     </select>
+
+    <!--分配查询-->
+    <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,
+            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
+        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 inv.lotnum = att.lotnum
+        left join base_sku sk on inv.sku = sk.sku
+        left join wms_doc_order_header wdoh on att.lotatt14 = wdoh.order_no
+        left join wms_doc_order_details wdod on wdod.order_no = wdod.order_no
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and wdoh.order_no = #{orderNo}</if>
+            <if test="status != null  and status != ''"> and t1.status = #{status}</if>
+            <if test="params.beginTime != null and params.beginTime != ''">
+                AND date_format(inv.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">
+                AND date_format(inv.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
 </mapper>

warewms-ams/src/main/resources/mapper/erp/ErpBarcodesInvMapper.xml

@@ -37,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qty" column="qty"></result>
         <result property="lotatt02" column="lotatt02"></result>
         <result property="sku" column="sku"></result>
+        <result property="skuName" column="skuName"></result>
+        <result property="specs" column="specs"></result>
         <result property="skuType" column="skuType"></result>
         <result property="barcode" column="barcode"></result>
     </resultMap>
@@ -46,12 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectErpBarcodesList"  resultMap="ErpBarcodesVOResult">
-        select csr.sn as lotatt02,ila.lotatt07 AS boxNo,bli.location_no as locationNo,illa.lotnum as lotnum,illa.qty as qty
+        select csr.sn as lotatt02,ila.lotatt07 AS boxNo,bli.location_no as locationNo,illa.lotnum as lotnum,illa.qty as qty,sk.sku sku,
+        sk.desc1 skuName, sk.specs specs
         from inv_lot_loc_id illa
         LEFT JOIN inv_lot_att ila on ila.lotnum = illa.lotnum
         LEFT JOIN base_location_info bli on bli.id = illa.location_id
         LEFT JOIN erp_barcodes eb on eb.lotnum = illa.lotnum
         LEFT JOIN code_sku_relationship csr on csr.sn = ila.lotatt02
+        LEFT JOIN base_sku sk on sk.sku = illa.sku
         <where>
             <if test="barcode != null  and barcode != ''"> and csr.sn like CONCAT('%', #{barcode},'%')</if>
             <if test="locationNo != null  and locationNo != ''"> and bli.location_no like CONCAT('%', #{locationNo},'%') </if>

warewms-ams/src/main/resources/mapper/erp/ErpSkuInvMapper.xml

@@ -33,12 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stockId" column="stockId"></result>
         <result property="locationNo" column="locationNo"></result>
         <result property="boxNo" column="boxNo"></result>
-        <result property="userdefine1" column="userdefine1"></result>
         <result property="qty" column="qty"></result>
         <result property="lotatt02" column="lotatt02"></result>
         <result property="sku" column="sku"></result>
         <result property="skuType" column="skuType"></result>
         <result property="barcode" column="barcode"></result>
+        <result property="specs" column="specs"></result>
+        <result property="skuName" column="skuName"></result>
     </resultMap>
 
     <sql id="selectErpBarcodesVo">
@@ -51,10 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         eb.stock_id AS stockId,
         bli.location_no AS locationNo,
         ila.lotatt07 AS boxNo,
-        illa.lotnum AS userdefine1,
         illa.qty AS qty,
         bs.sku AS sku,
-        bst.item_name AS skuType
+        bst.item_name AS skuType,
+        bs.specs AS specs,
+        bs.desc1 AS skuName
         FROM
         inv_lot_loc_id illa
         LEFT JOIN inv_lot_att ila on ila.lotnum = illa.lotnum
@@ -63,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN base_location_info bli ON bli.id = illa.location_id
         LEFT JOIN erp_barcodes eb ON eb.lotnum = illa.lotnum
         <where>
-            <if test="barcode != null  and barcode != ''">and  bs.sku like concat('%',#{barcode},'%')</if>
+            <if test="sku != null  and sku != ''">and  bs.sku like concat('%',#{sku},'%')</if>
             <if test="locationNo != null  and locationNo != ''">and bli.location_no like concat('%',#{locationNo},'%')</if>
             <if test="boxNo != null  and boxNo != ''">and ila.lotatt07 like concat('%',#{boxNo},'%')</if>
         </where>

warewms-base/src/main/java/com/ruoyi/base/domain/dto/BaseLocationGuiDTO.java

@@ -1,12 +1,16 @@
 package com.ruoyi.base.domain.dto;
 
 import com.ruoyi.base.domain.BaseLocationInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author JWK
  * @version 1.0
  * @date 2023/3/23 19:49
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class BaseLocationGuiDTO extends BaseLocationInfo {
 
     private String lotatt01;
@@ -31,180 +35,6 @@ public class BaseLocationGuiDTO extends BaseLocationInfo {
     private String skuName;
     private String isEmptyPlate;
     private String rowNoShiftNo;
+    private String specs;
 
-    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;
-    }
-
-    public String getSku() {
-        return sku;
-    }
-
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-    public String getSkuName() {
-        return skuName;
-    }
-
-    public void setSkuName(String skuName) {
-        this.skuName = skuName;
-    }
-
-    public String getIsEmptyPlate() {
-        return isEmptyPlate;
-    }
-
-    public void setIsEmptyPlate(String isEmptyPlate) {
-        this.isEmptyPlate = isEmptyPlate;
-    }
-
-    public String getRowNoShiftNo() {
-        return rowNoShiftNo;
-    }
-
-    public void setRowNoShiftNo(String rowNoShiftNo) {
-        this.rowNoShiftNo = rowNoShiftNo;
-    }
 }

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -592,7 +592,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              ,t4.lotatt01,t4.lotatt02,t4.lotatt03,t4.lotatt04,t4.lotatt05,t4.lotatt06
              ,t4.lotatt07,t4.lotatt08,t4.lotatt09,t4.lotatt10,t4.lotatt11,t4.lotatt12
              ,t4.lotatt13,t4.lotatt14,t4.lotatt15,t4.lotatt16,t4.lotatt17,t4.lotatt18
-             ,t5.sku,t5.desc1 skuName,t5.hazard_flag isEmptyPlate
+             ,t5.sku,t5.specs,t5.desc1 skuName,t5.hazard_flag isEmptyPlate
         FROM
             base_location_info t1
                 LEFT JOIN base_location_zone t2 on t2.zone_id = t1.zone_id