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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
@@ -26,14 +27,17 @@ import javax.persistence.Table;
 public class DataLink extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="编码")
+    @FieldAnnotation(notEmpty = true)
     private String code;
 
     @Column(name="TYPE")
     @ApiParam(value ="链接类型")
+    @FieldAnnotation(defaultValue = "CSV")
     private ApsEnumUtil.DATA_LINK_TYPE type;
 
     @Column(name="PATH")
     @ApiParam(value ="IP/文件路径")
+    @FieldAnnotation(notEmpty = true)
     private String path;
 
     @Column(name="PORT")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java

@@ -40,7 +40,7 @@ public class OperInput extends BaseAPS {
     private Long materialId;
 
     @Column(name="INPUT_COUNT")
-    @ApiParam(value ="输入数量")
+    @ApiParam(value ="单位输入量")
     private Double inputCount;
 
     @Column(name="YIELD")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java

@@ -39,7 +39,7 @@ public class OperOutput extends BaseAPS {
     private Long materialId;
 
     @Column(name="OUTPUT_COUNT")
-    @ApiParam(value ="输出数量")
+    @ApiParam(value ="单位输出量")
     private Double outputCount;
 
     @Column(name="YIELD")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -135,6 +135,10 @@ public class Work extends BaseAPS {
     @FieldAnnotation(modify = false)
     private String failedReason;
 
+    @Column(name="REMARK")
+    @ApiParam(value ="备注")
+    private String remark;
+
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(property = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java

@@ -312,6 +312,10 @@ public class BeanRelation {
         }
     }
 
+    public static void setOne(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
+        get(bean).get(holder).add(relaBean);
+    }
+
     /**
      * 移除关联
      *

modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml

@@ -2,7 +2,7 @@
 <Class name="WorkPlan">
     <Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
     </Relation>
-    <Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="false">
+    <Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="true">
     </Relation>
     <Relation field="PrevPlan" name="WorkPlan" reverse="PostPlan" type="MULTI_TO_MULTI" owner="false">
     </Relation>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -223,9 +223,7 @@ public class CommonEnumUtil {
         EXCEPTION_DETAIL(3, "异常明细"),
         EXCEPTION_SOLUTION(4, "解决方案"),
         ENUM(5, "枚举"),
-        MODULE(10, "模块"),
+        MENU(10, "功能权限"),
-        METHOD(11, "功能"),
-        BUTTON(12, "按钮"),
         WEB(13, "前端");
 
         private int value;
@@ -597,6 +595,15 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static METHOD_LEVEL get(int id){
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == id) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -642,7 +642,8 @@ public class WmsEnumUtil {
 		VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
         KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
 		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
-        KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货");
+        KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
+        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货");
 
 
         private int value;

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

@@ -46,4 +46,8 @@ public class MesWorkCell extends BaseBean {
     @Column(name = "WORK_CELL_TYPE")
     @ApiParam("工位类型")
     private Integer workCellType;
+
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
 }

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

@@ -129,6 +129,15 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
+    @Transient
+    @ApiParam("下线时间开始")
+    private String outWorkCenterTimeStart;
+
+    @Transient
+    @ApiParam("下线时间截止")
+    private String outWorkCenterTimeEnd;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -178,6 +187,8 @@ public class MesProduceSn extends BaseBean {
                 ", snType='" + snType + '\'' +
                 ", tray='" + tray + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
+                ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
+                ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
                 '}';
     }
 }

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

@@ -51,6 +51,10 @@ public class MesWorkCell extends BaseBean {
     @ApiParam("工位类型")
     private Integer workCellType;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 打印信息封装模板
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("打印信息封装模板")
+public class SnPrintDataModel {
+
+    @ApiParam("打印数据")
+    private List<SnPrintValueModel> snPrintValueModel;
+
+    @ApiParam("打印模板及参数")
+    private MesLabelTemplate labelTemplate;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码补打印
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("打印信息模板")
+public class SnPrintModel extends SnPrintValueModel {
+
+    @ApiParam("过程条码")
+    private SnPrintDataModel snPrintModel;
+
+    @ApiParam("产品条码")
+    private SnPrintDataModel prodPrintModel;
+
+    @ApiParam("包装条码")
+    private SnPrintDataModel packagePrintModel;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java

@@ -1,26 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description : 产品/包装打印模板model
- * @Reference :
- * @Author : wangjie
- * @CreateDate : 2019-08-18 11:00
- * @Modify:
- **/
-@Data
-public class SnPrintTemplateModel implements Serializable {
-
-    @ApiParam("产品条码模板")
-    private MesLabelTemplate prodSnPrintTemplate;
-
-    @ApiParam("包装条码模板集合")
-    private List<MesLabelTemplate> packageSnPrintTemplateList;
-
-}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java

@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码补打印
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("打印信息模板")
+public class SnPrintValueModel extends MesProduceSn {
+    @ApiParam("打印描述")
+    private String printDesc;
+
+    @ApiParam("条码")
+    private String barCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("批次号")
+    private String batchNo;
+
+    @ApiParam("箱数量")
+    private String boxQty;
+
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @ApiParam("生产日期")
+    private String productionTime;
+
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @ApiParam("包装规格")
+    private String packageSpec;
+
+    @ApiParam("供应商")
+    private String supplier;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @ApiParam("客户物料名称")
+    private String customerPartName;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("特殊批号")
+    private String fixLotNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1860,10 +1860,6 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getCreateDateTimeStart(),
-                mesProduceSn.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
         return packBean;
     }
 
@@ -1927,4 +1923,73 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 按条件分页查询产品条码补打印数据
+     * @param mesProduceSn
+     * @return
+     */
+    public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
+        DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
+        }
+
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesProduceSn.getCreateDateTimeStart(),
+                mesProduceSn.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesProduceSn.getOutWorkCenterTimeStart(),
+                mesProduceSn.getOutWorkCenterTimeEnd(),
+                "outWorkCenterTime", packBean, true);
+
+        return packBean;
+    }
+
+    /**
+     * 按条件分页查询包装条码补打印数据
+     * @param mesPackage
+     * @return
+     */
+    public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
+
+        DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
+            DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesPackage.getCreateDateTimeStart(),
+                mesPackage.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        return packBean;
+    }
+
 }

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

@@ -56,6 +56,8 @@ public class WmsMessageStyleModel implements Serializable {
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
         } else if (actQty == transQty) {//处理完成
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
+        } else if (transQty < actQty) {//处理中 处理数量可以大于需求数量
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
         }
     }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -50,8 +50,9 @@ public class SysMenu extends BaseBean {
      * 产品类型暂时不能填写, 产品以上线调整影响范围太大.
      */
     @Column(name="SOFT_TYPE")
-    @ApiParam(value ="产品类型", example = "0")
+    @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
-    private Integer softTyp;
+    @AnnoOutputColumn
+    private Integer softType;
 
     @Column(name="MENU_TYPE")
     @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -257,6 +257,7 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
 
         DdlPreparedPack.getInPackList(idList,"id",result);
+        if(menu != null){
             DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result);
             DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result);
             DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
@@ -264,16 +265,8 @@ public class CoreHqlPack {
             DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
 
             result.setOrderByStr(menu.orderBy());
-
-        return result;
         }
 
-    public static DdlPackBean packDdlBeanSysMenu(SysMenu menu){
-
-        DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
-        DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
-        result.setOrderByStr(menu.orderBy());
-
         return result;
     }
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * 物料数量DTO
+ */
+@Data
+public class WmsPartQtyDto {
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+    @ApiParam(value = "物料编码")
+    private String partNO;
+    @ApiParam(value = "应收数量")
+    private String qty;
+    @ApiParam(value = "实收数量")
+    private String rcQty;
+    @ApiParam(value = "待收数量")
+    private String dueQty;
+}

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

@@ -2414,7 +2414,9 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
         DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result);
-
+        if (StringUtils.isNotBlank(wmsRoutingRule.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getOrganizeCode(), "organizeCode", result);
+        }
         DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result);
         DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result);
         getStringBuilderPack(wmsRoutingRule, result);