【2688 08 extPDA-查询查看零件对应库位】

【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -105,6 +105,58 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String receiveDateTime;
 
+    @Transient
+    @ApiParam("类型名称")
+    public String busiTypeName;
+
+    @Transient
+    @ApiParam("物料编号")
+    public String partNo;
+
+    @ApiParam(value = "标题")
+    @Transient
+    public String title;
+
+    @Transient
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @Transient
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Transient
+    @ApiParam(value = "客户地址")
+    private String custAddr;
+
+    @Transient
+    @ApiParam(value = "联系人")
+    private String custOwner;
+
+    @Transient
+    @ApiParam(value = "电话号码")
+    private String custTel;
+
+    @Transient
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @Transient
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Transient
+    @ApiParam(value = "生产小组")
+    private String productionGroup;
+
+    @Transient
+    @ApiParam(value="修改日期查询用，查询起始日期")
+    public String modifyDateTimeStart;
+
+    @Transient
+    @ApiParam(value = "修改日期查询用，查询结束日期")
+    public String modifyDateTimeEnd;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -248,6 +248,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "替代物料编码")
     private String subPartNo;
 
+    @Transient
+    @ApiParam(value = "颜色")
+    private String color;
 
     @Transient
     @ApiParam(value = "替代物料名称")
@@ -474,4 +477,31 @@ public class WmsDocMovementDetails extends BaseBean {
         this.createDatetime = createDatetime;
     }
 
+    public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, String color) {
+        this.id = wmsDocMovementDetails.getId();
+        this.orderNo = wmsDocMovementDetails.getOrderNo();
+        this.partNo = wmsDocMovementDetails.getPartNo();
+        this.qty = wmsDocMovementDetails.getQty();
+        this.seqNo = wmsDocMovementDetails.getSeqNo();
+        this.partNameRdd = wmsDocMovementDetails.getPartNameRdd();
+        this.partSpec = wmsDocMovementDetails.getPartSpec();
+        this.workOrderCode = wmsDocMovementDetails.getWorkOrderCode();
+        this.productionGroup = wmsDocMovementDetails.getProductionGroup();
+        this.item = wmsDocMovementDetails.getItem();
+        this.planTime = wmsDocMovementDetails.getPlanTime();
+        this.planDate = wmsDocMovementDetails.getPlanDate();
+        this.unit = wmsDocMovementDetails.getUnit();
+        this.custNo = wmsDocMovementDetails.getCustNo();
+        this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo();
+        this.srcWhNo = wmsDocMovementDetails.getSrcWhNo();
+        this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo();
+        this.destWhNo = wmsDocMovementDetails.getDestWhNo();
+        this.destZoneNo = wmsDocMovementDetails.getDestZoneNo();
+        this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+        this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo();
+        this.destAreaNo = wmsDocMovementDetails.getDestAreaNo();
+        this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+        this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
+        this.color = color;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -277,6 +277,14 @@ public class WmsDocMovementMaster extends BaseBean {
     public String title;
 
     @Transient
+    @ApiParam(value = "生产小组")
+    private String productionGroup;
+
+    @Transient
+    @ApiParam(value = "父位置号")
+    private String seqNo;
+
+    @Transient
     @ApiParam("物料编号组")
     public String[] partNos;
 
@@ -284,6 +292,42 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("工厂集合")
     private List<String> organizeCodeList;
 
+    @Transient
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Transient
+    @ApiParam(value = "简称")
+    private String partSpec;
+
+    @Transient
+    @ApiParam(value = "工单码")
+    private String workOrderCode;
+
+    @Transient
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Transient
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @Transient
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Transient
+    @ApiParam(value = "客户地址")
+    private String custAddr;
+
+    @Transient
+    @ApiParam(value = "联系人")
+    private String custOwner;
+
+    @Transient
+    @ApiParam(value = "电话号码")
+    private String custTel;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
@@ -299,4 +343,32 @@ public class WmsDocMovementMaster extends BaseBean {
 
     public WmsDocMovementMaster() {
     }
+    public WmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster,String seqNo,String assignSrcZoneNo,String partNo,String partNameRdd,
+                                String partSpec,String workOrderCode,Double qty,String productionGroup,Integer busiType,String modifyDatetime,
+                                String custName,String custDesc,String custAddr,String custOwner,String custTel) {
+
+        this.id = wmsDocMovementMaster.getId();
+        this.orderNo = wmsDocMovementMaster.getOrderNo();
+        this.custNo = wmsDocMovementMaster.getCustNo();
+        this.organizeCode = wmsDocMovementMaster.getOrganizeCode();
+        this.orderStatus = wmsDocMovementMaster.getOrderStatus();
+        this.vendorNo = wmsDocMovementMaster.getVendorNo();
+        this.erpSrcNo = wmsDocMovementMaster.getErpSrcNo();
+        this.seqNo = seqNo;
+        this.assignSrcZoneNo = assignSrcZoneNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.partSpec = partSpec;
+        this.workOrderCode = workOrderCode;
+        this.qty = qty;
+        this.productionGroup = productionGroup;
+        this.busiType = busiType;
+        this.modifyDatetime = modifyDatetime;
+//        this.color = color;
+        this.custName = custName;
+        this.custDesc = custDesc;
+        this.custAddr = custAddr;
+        this.custOwner = custOwner;
+        this.custTel = custTel;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -180,6 +180,10 @@ public class WmsMoveSn extends BaseBean {
     public String serialSn;
 
     @Transient
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @Transient
     @ApiParam("业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     private Integer busiTypeCode;
@@ -376,4 +380,25 @@ public class WmsMoveSn extends BaseBean {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public WmsMoveSn(String partNo, String partNameRdd,String sn,String vendorNo,String custNo,String srcLocateNo,String destLocateNo,String srcZoneNo,
+                     Double srcQty,Double destQty,String orderNo,String srcWhNo, Integer srcQcStatus ,Integer descQcStatus,
+                     Integer srcSnStatus,Integer destSnStatus ) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.vendorNo = vendorNo;
+        this.custNo = custNo;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.srcZoneNo = srcZoneNo;
+        this.srcQty = srcQty;
+        this.destQty = destQty;
+        this.orderNo = orderNo;
+        this.srcWhNo = srcWhNo;
+        this.srcQcStatus = srcQcStatus;
+        this.descQcStatus = descQcStatus;
+        this.srcSnStatus = srcSnStatus;
+        this.destSnStatus = destSnStatus;;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -3481,4 +3481,23 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 字典查询
+     *
+     * @param wmsEnum
+     * @return
+     */
+    public static DdlPackBean packHqlWmsEnum(WmsEnum wmsEnum) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsEnum.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumType(), "enumType", result);
+        DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumValue(), "enumValue", result);
+
+        getStringBuilderPack(wmsEnum, result);
+
+        return result;
+    }
 }