Finish Task #2027 Cost:10h

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

@@ -118,7 +118,31 @@ public class SapDocFgSum extends BaseBean {
     @Transient
     public Long wdfdId;
 
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
+
     public SapDocFgSum(){}
+
+    public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
+                       String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion) {
+        this.wdfdId = wdfdId;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.unit = unit;
+        this.erpWorkCenter = erpWorkCenter;
+        this.inAreaNo = inAreaNo;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.itemUnit = itemUnit;
+        this.outAreaNo = outAreaNo;
+        this.itemQty = itemQty;
+        this.src = src;
+        this.isLock = isLock;
+        this.effStartTime = effStartTime;
+        this.bomVersion = bomVersion;
+    }
     public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
                        String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {
         this.wdfdId = wdfdId;

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

@@ -104,7 +104,6 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="SID")
     @ApiParam("SID")
     public String sid;
-
     /**
      * 状态:10=新建,20=已处理,30=处理出错
      */
@@ -150,4 +149,8 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name = "BATCH_NO")
     @ApiParam("批号")
     private String batchNo;
+
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
 }

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

@@ -207,6 +207,18 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "客户零件号")
     private String custPartNo;
 
+    @Column(name = "MATERIAL_TYPE")
+    @ApiParam(value = "物料类型")
+    private String materialType;
+
+    @Column(name = "PART_SPEC")
+    @ApiParam(value = "简称")
+    private String partSpec;
+
+    @Column(name = "WORK_ORDER_CODE")
+    @ApiParam(value = "工单码")
+    private String workOrderCode;
+
     @Column(name = "SEQ_NO")
     @ApiParam(value = "父位置号")
     private String seqNo;

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

@@ -13,7 +13,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : 库存移动单明细信息
@@ -176,6 +181,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String groupNo;
 
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String bomVersion;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;

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

@@ -199,6 +199,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
+
 
     @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''")
     @ApiParam(value = "QAD发运单据类型")

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

@@ -458,6 +458,41 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("挑选状态")
     public Integer pickResult;
 
+    @Transient
+    @ApiParam("位置号")
+    public String positionNo;
+
+
+    @Transient
+    @ApiParam(value = "材料类型")
+    private String melType;
+
+    @Transient
+    @ApiParam(value = "项目号")
+    private String projectNo;
+
+    @Transient
+    @ApiParam(value = "生产小组")
+    private String productionGroup;
+
+    @Transient
+    @ApiParam(value = "客户零件号")
+    private String custPartNo;
+
+    @Transient
+    @ApiParam(value = "物料类型")
+    private String materialType;
+
+    @Transient
+    @ApiParam(value = "工单码")
+    private String workOrderCode;
+
+    @Transient
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+
+
     public WmsStockSn() {
     }
 
@@ -694,5 +729,63 @@ public class WmsStockSn extends BaseBean {
 
     }
 
+    public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
+                      String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
+                      String qualityDate, String custNo, String custSn, String sn2d,
+                      String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser,
+                      String positionNo, Date pdate, Integer printed, String refSrc, String refType,
+                      String shippingFlag, String workCenterCode, Integer snType,
+                      String packagePartNo, Integer useCount, Integer seqNo,
+                      String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
+                      String prodCfgTypeName, String custNameRdd) {
+        this.organizeCode = organizeCode;
+        this.id = id;
+        this.sn = sn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.locateNo = locateNo;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+        this.vendorNo = vendorNo;
+        this.vendorNameRdd = vendorNameRdd;
+        this.qualityDate = qualityDate;
+        this.custNo = custNo;
+        this.custSn = custSn;
+        this.sn2d = sn2d;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.positionNo = positionNo;
+        this.pdate = pdate;
+        this.printed = printed;
+        this.refSrc = refSrc;
+        this.refType = refType;
+        this.shippingFlag = shippingFlag;
+        this.workCenterCode = workCenterCode;
+        this.snType = snType;
+        this.packagePartNo = packagePartNo;
+        this.useCount = useCount;
+        this.seqNo = seqNo;
+
+        this.whNameRdd = whNameRdd;
+        this.locateNameRdd = locateNameRdd;
+        this.zoneNameRdd = zoneNameRdd;
+        this.partTypeDesc = partTypeDesc;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.custNameRdd = custNameRdd;
+        this.vendorNameRdd = vendorNameRdd;
+    }
+
 
 }

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

@@ -56,7 +56,11 @@ public class WmsHqlPack {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
         // 封装有效状态、删除状态、创建人和创建时间
+        if (StringUtil.isEmpty(bean.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr);
+        } else {
             DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         return hqlStr;