Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :生产区域
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_AREA")
+@Api("生产区域")
+public class MesArea extends BaseBean {
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesAreaRepository extends BaseRepository<MesArea, Long> {
+}

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

@@ -598,25 +598,25 @@ public class WmsHqlPack {
      * @param wmsShopping
      * @return
      */
-    public static String packHqlWmsShipping(WmsShopping wmsShopping) {
+    public static DdlPackBean packHqlWmsShipping(WmsShopping wmsShopping) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         //发运单号
-        HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
         //客户编码
-        HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
         //物料编码
-        HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
         //条码
-        HqlPack.getStringEqualPack(wmsShopping.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsShopping.getSn(), "sn", result);
         //发运状态
-        HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result);
         //特殊发货标志
-        HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result);
+        DdlPreparedPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result);
 
         getStringBuilderPack(wmsShopping, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1058,21 +1058,21 @@ public class WmsHqlPack {
      * @param wmsQCMaster
      * @return
      */
-    public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) {
+    public static DdlPackBean packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         //单号
-        HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         //业务类型
-        HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
+        DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
         //关联单据类型
-        HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
+        DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
-        HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
 
         getStringBuilderPack(wmsQCMaster, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1121,15 +1121,15 @@ public class WmsHqlPack {
      * @param wmsQCDetails
      * @return
      */
-    public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) {
+    public static DdlPackBean packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         //单号
-        HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result);
 
         getStringBuilderPack(wmsQCDetails, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1138,16 +1138,16 @@ public class WmsHqlPack {
      * @param wmsQCTrans
      * @return
      */
-    public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
+    public static DdlPackBean packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
         //单号
-        HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
         //物料
-        HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsQCTrans, result);
 
-        return result.toString();
+        return result;
     }
 
     /**