BH-CODE 出库，绑定

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -340,6 +342,11 @@ public class WmsDocMovementDetails extends BaseBean {
     public Integer isSn;
 
 
+    @Column(name = "REF_SRC")
+    @ApiParam("关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String refSrc;
+
     public WmsDocMovementDetails () {
 
     }

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

@@ -188,30 +188,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "QAD发运单据类型")
     private String erpSrcType;
 
-    @Transient
-    @ApiParam(value = "发运单号")
-    private String shipOrderNo;
-
-    @Transient
-    @ApiParam(value = "打印时间")
-    private String printDate;
-
-    @Transient
-    @ApiParam("类型名称")
-    public String busiTypeName;
-
-    @Transient
-    @ApiParam("物料编号")
-    public String partNo;
-
-    @ApiParam(value = "标题")
-    @Transient
-    public String title;
-
-    @Transient
-    @ApiParam("物料编号组")
-    public String[] partNos;
-
     @ApiParam("是否正常运输")
     @Column(name = "IS_NORMAL_TRANSPORTATION")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@@ -230,7 +206,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     //正常运输 和非正常运输
     @Column(name = "BUSINESS_TYPE")
-    @ApiParam(value = "业务类型")
+    @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer businessType;
@@ -242,11 +218,36 @@ public class WmsDocMovementMaster extends BaseBean {
     private Integer isTransportationCreation;
 
     @Column(name = "IS_GOOD_PRODUCT")
-    @ApiParam(value = "运输信息创建")
+    @ApiParam(value = "是否良品")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
     private Integer isGoodProduct;
 
+    @Transient
+    @ApiParam(value = "发运单号")
+    private String shipOrderNo;
+
+    @Transient
+    @ApiParam(value = "打印时间")
+    private String printDate;
+
+    @Transient
+    @ApiParam("类型名称")
+    public String busiTypeName;
+
+    @Transient
+    @ApiParam("物料编号")
+    public String partNo;
+
+    @ApiParam(value = "标题")
+    @Transient
+    public String title;
+
+    @Transient
+    @ApiParam("物料编号组")
+    public String[] partNos;
+
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

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

@@ -78,6 +78,7 @@ public class WmsLogisticExpenseRecords extends BaseBean {
     public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) {
 //        this.organizeName = docMovementMaster.getorganizeName;
         this.orderNo = docMovementMaster.getOrderNo();
+        this.organizeCode = docMovementMaster.getOrganizeCode();
         this.shippingFlag = docMovementMaster.getFlagNo();
         this.busiType = docMovementMaster.getBusiType();
         this.transportType = docMovementMaster.getTransportType();

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -51,6 +53,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
+    @Column(name = "PART_UNIT")
+    @ApiParam(value = "物料单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partUnit;
+
     @Column(name = "unit")
     @ApiParam(value = "计量单位")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
@@ -77,5 +84,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String endTime;
 
-
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
 }

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

@@ -64,7 +64,7 @@ public class WmsLogisticsCosts extends BaseBean {
     private String salesUnit;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输类型")
+    @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;

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

@@ -102,6 +102,29 @@ public class WmsLogisticsFreightApproval extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isUrgent;
 
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String assignSrcWhNo;
+
+    @Column(name = "REMAKE")
+    @ApiParam("备注")
+    public String remake;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String assignDestWhNo;
+
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "客户发往地编号")
+    private String flagNo;
+
+    //正常运输 和非正常运输
+    @Column(name = "BUSINESS_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
+    private Integer businessType;
+
     public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
         this.orderNo = docMovementMaster.getOrderNo();
         this.organizeCode = docMovementMaster.getOrganizeCode();
@@ -114,10 +137,12 @@ public class WmsLogisticsFreightApproval extends BaseBean {
         this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
         this.transportType = docMovementMaster.getTransportType();
         this.placeOfOriginCode = docMovementMaster.getFlagNo();
-//        this.placeOfOriginDesc = placeOfOriginDesc;
         this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo();
-//        this.custDeliveryDesc = custDeliveryDesc;
         this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+        this.assignSrcWhNo = docMovementMaster.getAssignSrcWhNo();
+        this.assignDestWhNo = docMovementMaster.getAssignDestWhNo();
+        this.flagNo = docMovementMaster.getFlagNo();
+        this.businessType = docMovementMaster.getBusinessType();
     }
 
     public WmsLogisticsFreightApproval() {

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

@@ -69,7 +69,7 @@ public class WmsShortLogisticsCosts extends BaseBean {
     private String logisticsVendorNo;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输类型")
+    @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;

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

@@ -106,10 +106,6 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("物料编码")
     private String partNo;
 
-    @Transient
-    @ApiParam("关联单号")
-    private String refOrderNo;
-
     @Column(name="PATH_URL")
     @ApiParam("回执单地址")
     private String pathUrl;

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

@@ -60,9 +60,9 @@ public class WmsTmsShippingExtDetail extends BaseBean {
 	@ApiParam("单位")
 	public String unit;
 
-	@Column(name = "ORDER_NO")
+	@Column(name = "REF_ORDER_NO")
-	@ApiParam("订单号")
+	@ApiParam("关联单号")
-	public String orderNo;
+	private String refOrderNo;
 
 	@Column(name = "SRC_WH_NO")
 	@ApiParam("源仓库代码")
@@ -308,7 +308,6 @@ public class WmsTmsShippingExtDetail extends BaseBean {
 		this.item = docMovementDetails.getItem();
 		this.qty =docMovementDetails.getQty();
 		this.unit = docMovementDetails.getUnit();
-		this.orderNo = docMovementDetails.getOrderNo();
 		this.srcWhNo = docMovementDetails.getSrcWhNo();
 		this.srcZoneNo = docMovementDetails.getSrcZoneNo();
 		this.srcLocateNo = docMovementDetails.getSrcLocateNo();
@@ -331,6 +330,7 @@ public class WmsTmsShippingExtDetail extends BaseBean {
 		this.destAreaNo = docMovementDetails.getDestAreaNo();
 		this.lotNo = docMovementDetails.getLotNo();
 		this.srcItem = docMovementDetails.getSrcItem();
+		this.refOrderNo = docMovementDetails.getOrderNo();
 		this.custOrderNo = docMovementDetails.getCustOrderNo();
 		this.assignDateCode = docMovementDetails.getAssignDateCode();
 		this.actualLot = docMovementDetails.getActualLot();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java

@@ -127,7 +127,6 @@ public class WmsTmsShippingExtModel {
 		this.shippingTime=wmsTmsShippingExt.getCreateDatetime();
 		this.shippingUser=wmsTmsShippingExt.getCreateUser();
 		this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation();
-		this.refOrderNo=wmsTmsShippingExt.getRefOrderNo();
 		this.orderDate=wmsTmsShippingExt.getCreateDatetime();
 	}
 }

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

@@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin;
 import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
+import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
@@ -3371,6 +3372,22 @@ public class WmsHqlPack {
         return packBean;
     }
 
+    /**
+     * 装车单 传输类
+     *
+     * @param model
+     * @return
+     */
+    public static DdlPackBean packHqlTmsShip(WmsTmsShipDto model) {
+
+        DdlPackBean packBean = WmsHqlPack.packHqlWms(model.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(model.getOrderStatus(), "orderStatus", packBean);
+        DdlPreparedPack.getStringEqualPack(model.getMoveNo(), "moveNo", packBean);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.FALSE},
+                new String[]{"createDatetime"}, packBean);
+        return packBean;
+    }
 
     /**
      * BH检测大类表查询条件