Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/Produce.java

@@ -25,6 +25,7 @@ public class Produce implements Serializable {
     private String producePattern;         //产品型号前两位  WA
     private String produceModel;           //产品型号后两位  1X
     private String produceFeature;         //产品特性  产品特性 A：国内；B：美国；C：欧洲；D：其他；
+    private String produceBrand;         //品牌字母
 
     private Integer employeeId;            //员工id
     private Integer wechatMpId;            //所属公众号ID
@@ -174,4 +175,12 @@ public class Produce implements Serializable {
                 ", produceUpdateTime=" + produceUpdateTime +
                 '}';
     }
+
+    public String getProduceBrand() {
+        return produceBrand;
+    }
+
+    public void setProduceBrand(String produceBrand) {
+        this.produceBrand = produceBrand;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -558,7 +558,8 @@
             TRPP.produce_pattern AS producePattern,
             TRPP.produce_model AS produceModel,
             TRPP.produce_feature AS produceFeature,
-			TRPP.produce_name AS produceName
+			TRPP.produce_name AS produceName,
+			TRPP.produce_brand AS produceBrand
         FROM
             tb_rst_pts_produce TRPP
         WHERE

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -12,7 +12,8 @@
             tb_rst_pts_produce.produce_remake AS produceRemake,
             tb_rst_pts_produce.produce_create_time AS  produceCreateTime,
             tb_rst_pts_produce.produce_update_time AS produceUpdateTime,
-            tb_rst_pts_produce.wechat_mp_id AS wechatMpId
+            tb_rst_pts_produce.wechat_mp_id AS wechatMpId,
+            tb_rst_pts_produce.produce_brand AS produceBrand
         FROM
             tb_rst_pts_produce
         <where>
@@ -36,6 +37,7 @@
         <result column="produce_create_time" property="produceCreateTime" />
         <result column="produce_update_time" property="produceUpdateTime" />
         <result column="wechat_mp_id" property="wechatMpId" />
+        <result column="produce_brand" property="produceBrand" />
         <collection property="process" column="{produceId = produce_id}" javaType="ArrayList"
                     ofType="com.iamberry.rst.core.pts.ProduceProcess" select="getAllProduceProcessList"/>
     </resultMap>
@@ -128,7 +130,8 @@
         tb_rst_pts_produce.produce_remake AS produceRemake,
         tb_rst_pts_produce.produce_create_time AS  produceCreateTime,
         tb_rst_pts_produce.produce_update_time AS produceUpdateTime,
-        tb_rst_pts_produce.wechat_mp_id AS wechatMpId
+        tb_rst_pts_produce.wechat_mp_id AS wechatMpId,
+        tb_rst_pts_produce.produce_brand AS produceBrand
         FROM
         tb_rst_pts_produce
         WHERE
@@ -197,8 +200,8 @@
 
 
     <insert id="saveProduce" parameterType="Produce" useGeneratedKeys="true"  keyProperty="produceId">
-        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake,produce_type,produce_pattern,produce_model,produce_feature,wechat_mp_id)
-        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceType},#{producePattern},#{produceModel},#{produceFeature},#{wechatMpId})
+        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake,produce_type,produce_pattern,produce_model,produce_feature,wechat_mp_id,produce_brand)
+        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceType},#{producePattern},#{produceModel},#{produceFeature},#{wechatMpId},#{produceBrand})
     </insert>
 
     <update id="updateProduce" parameterType="Produce" >
@@ -229,7 +232,10 @@
                 produce_remake = #{produceRemake},
             </if>
             <if test="wechatMpId !=null and wechatMpId !=''">
-                wechat_mp_id = #{wechatMpId}
+                wechat_mp_id = #{wechatMpId},
+            </if>
+            <if test="produceBrand !=null and produceBrand !=''">
+                produce_brand = #{produceBrand}
             </if>
         </set>
         WHERE
@@ -314,7 +320,8 @@
             produce_remake AS produceRemake,
             produce_create_time AS  produceCreateTime,
             produce_update_time AS produceUpdateTime,
-            wechat_mp_id AS wechatMpId
+            wechat_mp_id AS wechatMpId,
+            produce_brand AS produceBrand
 
         FROM
             tb_rst_pts_produce
@@ -335,7 +342,8 @@
         produce_remake AS produceRemake,
         produce_create_time AS  produceCreateTime,
         produce_update_time AS produceUpdateTime,
-        wechat_mp_id AS wechatMpId
+        wechat_mp_id AS wechatMpId,
+        produce_brand AS produceBrand
         FROM
         tb_rst_pts_produce
         WHERE
@@ -350,6 +358,7 @@
         <result column="produce_remake" property="produceRemake"/>
         <result column="produce_create_time" property="produceCreateTime"/>
         <result column="produce_update_time" property="produceUpdateTime"/>
+        <result column="produce_brand" property="produceBrand"/>
         <collection property="process" column="produce_id" ofType="ProduceProcess" select="listSelectProduceProcess"/>
     </resultMap>
 
@@ -448,7 +457,8 @@
         produce_remake AS produceRemake,
         produce_create_time AS  produceCreateTime,
         produce_update_time AS produceUpdateTime,
-        wechat_mp_id AS wechatMpId
+        wechat_mp_id AS wechatMpId,
+        produce_brand AS produceBrand
         FROM
         tb_rst_pts_produce LIMIT 1
     </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -613,6 +613,7 @@ public class AdminMachineController {
     private String productModel = "1X";//产品型号
     private String productFeatures = "A";//产品特性
     private String softwareVersion = "30";//软件版本
+    private String productBrand = "";//品牌字母
 
     //生成条形码
     public String generationBarCode(Produce produce) {
@@ -627,8 +628,9 @@ public class AdminMachineController {
         producePattern = produce.getProducePattern();
         productModel = produce.getProduceModel();
         productFeatures = produce.getProduceFeature();
+        productBrand = produce.getProduceBrand();
         //拼接
-        String barcode = producePattern + productModel + productFeatures +  String.valueOf(year).substring(2, 4) + months;
+        String barcode = productBrand+producePattern + productModel + productFeatures +  String.valueOf(year).substring(2, 4) + months;
         return barcode;
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -172,6 +172,7 @@
             var producePattern =  produce.producePattern;    //获取产品型号前两位
             var produceModel =  produce.produceModel;        //获取产品型号后两位
             var produceName = produce.produceName;            //获取产品名称
+            var produceBrand = produce.produceBrand;            //获取品牌字母
 
             var machineNo = "NO." + $("#"+machineBarcode+"Id").val();
             for (var i = 0; i < settingNumber; i++) {
@@ -348,6 +349,7 @@
         var producePattern =  produce.producePattern;    //获取产品型号前两位
         var produceModel =  produce.produceModel;        //获取产品型号后两位
         var produceName = produce.produceName;            //获取产品名称
+        var produceBrand = produce.produceBrand;            //获取品牌字母
 
         for (var i=0;i<settingNumber;i++){
             code128(machineBarcode);

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -59,6 +59,8 @@
                     </#if>
                     </select>
                 </div>
+                <div class="input-box"><span class="input-dic">品牌字母</span><input class="my-input" name="produceBrand" id="produceBrand" type="text" value="" placeholder="请输入品牌字母" required   maxlength="20" minlength="1"/> </div>
+
                 <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" value="" placeholder="1-15位英文、数字组合" required  maxlength="15" minlength="1"/>-
                     <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="" placeholder="1-15位英文、数字组合" required  maxlength="15" minlength="1"/>  </div>
 
@@ -226,6 +228,7 @@
         produce.producePattern = $("[name='producePattern']").val();//产品型号
         produce.produceModel = $("[name='produceModel']").val();//产品型号
         produce.wechatMpId = $("[name='wechatMpId']").val();//公众号id
+        produce.produceBrand = $("[name='produceBrand']").val();//品牌字母
         return produce;
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl

@@ -60,7 +60,7 @@
                 </#if>
                 </select>
             </div>
-
+            <div class="input-box"><span class="input-dic">品牌字母</span><input class="my-input" name="produceBrand" id="produceBrand" type="text" value="${produce.produceBrand!}" placeholder="请输入品牌字母" required   maxlength="20" minlength="1"/> </div>
             <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" placeholder="1-15位英文、数字组合" value="${produce.producePattern!}" placeholder="" required  maxlength="15" minlength="1"/>-
                 <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="${produce.produceModel!}" placeholder="1-15位英文、数字组合" required  maxlength="15" minlength="1"/>  </div>
 
@@ -247,6 +247,7 @@
         produce.producePattern = $("[name='producePattern']").val();//产品型号
         produce.produceModel = $("[name='produceModel']").val();//产品型号
         produce.wechatMpId = $("[name='wechatMpId']").val();//公众号id
+        produce.produceBrand = $("[name='produceBrand']").val();//品牌字母
 
         produce.delProcessIds = delProcessIds;    //需要删除的工序id
         produce.delNodeIds = delNodeIds;           //需要删除的工序操作id