审批系统修改

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -122,6 +122,8 @@ public class SalesOrder implements Serializable {
 
     private Date salesDistributionTime;//通知配货时间
 
+    private Integer salesWarehouseId;//所属仓库id
+
     public Integer getStartOrderNO() {
         return startOrderNO;
     }
@@ -713,4 +715,12 @@ public class SalesOrder implements Serializable {
     public void setIsSelectCustomer(Integer isSelectCustomer) {
         this.isSelectCustomer = isSelectCustomer;
     }
+
+    public Integer getSalesWarehouseId() {
+        return salesWarehouseId;
+    }
+
+    public void setSalesWarehouseId(Integer salesWarehouseId) {
+        this.salesWarehouseId = salesWarehouseId;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/order/OrderWarehouse.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.core.order;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2018/12/28.
+ */
+public class OrderWarehouse implements Serializable {
+    private static final long serialVersionUID = -3658024565547001175L;
+    private Integer warehouseId;//
+    private String warehouseName;//仓库名称
+    private Integer warehouseState;//仓库状态 1 可用 2 停用
+    private String warehouseIntroduction;//仓库简介
+    private Date warehouseCreateTime;
+
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public Integer getWarehouseState() {
+        return warehouseState;
+    }
+
+    public void setWarehouseState(Integer warehouseState) {
+        this.warehouseState = warehouseState;
+    }
+
+    public String getWarehouseIntroduction() {
+        return warehouseIntroduction;
+    }
+
+    public void setWarehouseIntroduction(String warehouseIntroduction) {
+        this.warehouseIntroduction = warehouseIntroduction;
+    }
+
+    public Date getWarehouseCreateTime() {
+        return warehouseCreateTime;
+    }
+
+    public void setWarehouseCreateTime(Date warehouseCreateTime) {
+        this.warehouseCreateTime = warehouseCreateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/order/OrderWarehouseAdmin.java

@@ -0,0 +1,47 @@
+package com.iamberry.rst.core.order;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2018/12/28.
+ */
+public class OrderWarehouseAdmin implements Serializable {
+    private static final long serialVersionUID = -3586386989226148741L;
+    private Integer warehouseAdminId;
+    private Integer adminId;//管理员id
+    private Integer warehouseId;//仓库id
+    private Date warehouseCreateTime;//创建时间
+
+    public Integer getWarehouseAdminId() {
+        return warehouseAdminId;
+    }
+
+    public void setWarehouseAdminId(Integer warehouseAdminId) {
+        this.warehouseAdminId = warehouseAdminId;
+    }
+
+    public Integer getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Integer adminId) {
+        this.adminId = adminId;
+    }
+
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public Date getWarehouseCreateTime() {
+        return warehouseCreateTime;
+    }
+
+    public void setWarehouseCreateTime(Date warehouseCreateTime) {
+        this.warehouseCreateTime = warehouseCreateTime;
+    }
+}

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

@@ -36,6 +36,8 @@ public class Produce implements Serializable {
 
     private String json;  //传入json值
 
+    private String isPrintQrcode;  //是否打印二维码 1 是 2否
+
     public Integer getProduceId() {
         return produceId;
     }
@@ -183,4 +185,12 @@ public class Produce implements Serializable {
     public void setProduceBrand(String produceBrand) {
         this.produceBrand = produceBrand;
     }
+
+    public String getIsPrintQrcode() {
+        return isPrintQrcode;
+    }
+
+    public void setIsPrintQrcode(String isPrintQrcode) {
+        this.isPrintQrcode = isPrintQrcode;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -2,10 +2,7 @@ package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
-import com.iamberry.rst.core.order.DownsingleRuleInfo;
-import com.iamberry.rst.core.order.OrderCorrectInfo;
-import com.iamberry.rst.core.order.OrderCorrectItem;
-import com.iamberry.rst.core.order.PostInfo;
+import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.tools.LogisticsInfo;
@@ -400,4 +397,11 @@ public interface SalesOrderService {
      * @return
      */
     List<OrderCorrectInfo> listOrderCorrectInfo(Integer orderId);
+
+    /**
+     * 根据当前登录人获取所属仓库
+     * @param adminId
+     * @return
+     */
+    OrderWarehouse selectAdminWarehouse(Integer adminId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1085,4 +1085,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public List<OrderCorrectInfo> listOrderCorrectInfo(Integer orderId) {
         return salesOrderMapper.listOrderCorrectInfo(orderId);
     }
+
+    @Override
+    public OrderWarehouse selectAdminWarehouse(Integer adminId) {
+        return salesOrderMapper.selectAdminWarehouse(adminId);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java

@@ -2,10 +2,7 @@ package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
-import com.iamberry.rst.core.order.DownsingleRuleInfo;
-import com.iamberry.rst.core.order.OrderCorrectInfo;
-import com.iamberry.rst.core.order.OrderCorrectItem;
-import com.iamberry.rst.core.order.PostInfo;
+import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 
 import java.util.Date;
@@ -333,4 +330,11 @@ public interface SalesOrderMapper {
      * @return
      */
     List<OrderCorrectInfo> listOrderCorrectInfo(Integer orderId);
+
+    /**
+     * 根据当前登录人获取所属仓库
+     * @param adminId
+     * @return
+     */
+    OrderWarehouse selectAdminWarehouse(Integer adminId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -31,6 +31,7 @@
     <result column="sales_store_id" property="salesStoreId" jdbcType="INTEGER" />
     <result column="sales_company_id" property="salesCompanyId" jdbcType="INTEGER" />
     <result column="sales_type" property="salesType" jdbcType="INTEGER" />
+    <result column="sales_warehouse_id" property="salesWarehouseId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="salesOrderInfo" >
         sales_id,sales_orderId,sales_openId,sales_discount_money,sales_pledge_money,sales_remain_deposit,
@@ -348,6 +349,10 @@
                     #{node}
                 </foreach >
             </if>
+            <if test="salesWarehouseId != null ">
+                AND sales_warehouse_id = #{salesWarehouseId}
+            </if>
+
         </where>
         GROUP BY tb_rst_sales_order_info.sales_id
         ORDER BY sales_create_time DESC
@@ -626,7 +631,8 @@
                 sales_add_type,
                 sales_create_time,
                 sales_admin_id,
-                sales_customer_id
+                sales_customer_id,
+                sales_warehouse_id
             )
         values
             (
@@ -671,7 +677,8 @@
                 #{salesAddType},
                 #{salesCreateTime},
                 #{salesAdminId},
-                #{salesCustomerId}
+                #{salesCustomerId},
+                #{salesWarehouseId}
             )
   </insert>
 
@@ -1219,7 +1226,8 @@
         SET
           sales_shipping_status = #{salesShippingStatus},
           sales_orderId = #{salesOrderId},
-          sales_distribution_time = NOW()
+          sales_distribution_time = NOW(),
+          sales_warehouse_id = #{salesWarehouseId}
         WHERE
           sales_shipping_status = 0
         AND
@@ -1553,4 +1561,14 @@
         item_num = #{itemNum}
         where item_id = #{itemId}
     </update>
+
+    <select id="selectAdminWarehouse" parameterType="Integer" resultType="OrderWarehouse">
+       SELECT
+            ow.*
+        FROM
+            tb_rst_order_warehouse_admin owa
+        LEFT JOIN
+        tb_rst_order_warehouse  ow on owa.warehouse_id = ow.warehouse_id
+        WHERE owa.admin_id = #{adminId}
+    </select>
 </mapper>

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

@@ -559,7 +559,8 @@
             TRPP.produce_model AS produceModel,
             TRPP.produce_feature AS produceFeature,
 			TRPP.produce_name AS produceName,
-			TRPP.produce_brand AS produceBrand
+			TRPP.produce_brand AS produceBrand,
+			TRPP.is_print_qrcode AS isPrintQrcode
         FROM
             tb_rst_pts_produce TRPP
         WHERE

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -915,10 +915,13 @@ public class AdminSalesOrderController {
     @ResponseBody
     @RequestMapping("/notice_distribution")
     @RequiresPermissions("salesOrder:distribution:salesOrder")
-    public ResponseJson noticeDistribution(HttpServletRequest request,Integer[] salesOrderIds) throws Exception {
+    public ResponseJson noticeDistribution(HttpServletRequest request,Integer[] salesOrderIds,Integer warehouseId) throws Exception {
         ResponseJson rj = ResponseJson.getFAILURE();
         Integer flag = 0;
         StringBuilder errorId = new StringBuilder();
+        if(warehouseId == null){
+            return rj;
+        }
         for (Integer salesIds:salesOrderIds) {
             SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesIds);
             if(salesOrder == null || salesOrder.getSalesPostFirm() == null || salesOrder.getSalesPostFirm().isEmpty()){
@@ -930,6 +933,7 @@ public class AdminSalesOrderController {
             newOrder.setSalesId(salesIds);
             newOrder.setSalesOrderId(salesOrder.getSalesDealCode());
             newOrder.setSalesShippingStatus(11);
+            newOrder.setSalesWarehouseId(warehouseId);
             flag = salesOrderService.noticeDistribution(newOrder);
             if(flag < 1){
                 errorId.append(salesIds).append(",");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -2,16 +2,15 @@ package com.iamberry.rst.controllers.order;
 
 import com.alibaba.fastjson.JSONObject;
 import com.iamberry.rst.core.cm.*;
-import com.iamberry.rst.core.order.EOrderRequestData;
-import com.iamberry.rst.core.order.PostInfo;
-import com.iamberry.rst.core.order.PostOrderNum;
-import com.iamberry.rst.core.order.ProductColor;
+import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsBatch;
+import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.*;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
+import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.OrderUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.*;
@@ -80,42 +79,49 @@ public class AwaitSendController {
                                            @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                            @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
+        ModelAndView mv = new ModelAndView("order/salesOrder/list_wait_send_order");
         // 分页获取订单信息（仓库只能查询已确认的订单）
-        salesOrder.setSalesStatus(1);
-        PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
-        if (totalNum != 0) {
-            pagedResult.setTotal(totalNum);
+        Admin admin = AdminUtils.getLoginAdmin();
+        //查询当前登录人属于哪个仓库
+        OrderWarehouse orderWarehouse = salesOrderService.selectAdminWarehouse(admin.getAdminId());
+        if(orderWarehouse == null){
+            return mv;
         }
-        // 查询订单项
-        if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {
-            for (SalesOrder temp : pagedResult.getDataList()) {
-                SalesOrderItem item = new SalesOrderItem();
-                item.setItemOrderId(temp.getSalesId());
-                temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
+            salesOrder.setSalesWarehouseId(orderWarehouse.getWarehouseId());
+            salesOrder.setSalesStatus(1);
+            PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
+            if (totalNum != 0) {
+                pagedResult.setTotal(totalNum);
             }
-        }
-        int errorOrderNum = 0;
-        // 聚合打单方式
-        Map<String, Integer> postMap = new HashMap<>();
-        List<PostInfo> postInfos = salesOrderService.listWaitPrintOrderNum();
-        if (postInfos != null && !postInfos.isEmpty()) {
-            for (PostInfo temp : postInfos) {
-                LogisticsInfo info = new LogisticsInfo();
-                info.setLogisticsRstCode(temp.getPostFirm());
-                List<LogisticsInfo> logisticsInfos = salesOrderService.getLogisticsInfo(info);
-                if (logisticsInfos == null || logisticsInfos.size() <= 0) {
-                    errorOrderNum ++;
-                    continue;
+            // 查询订单项
+            if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {
+                for (SalesOrder temp : pagedResult.getDataList()) {
+                    SalesOrderItem item = new SalesOrderItem();
+                    item.setItemOrderId(temp.getSalesId());
+                    temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
+                }
+            }
+            int errorOrderNum = 0;
+            // 聚合打单方式
+            Map<String, Integer> postMap = new HashMap<>();
+            List<PostInfo> postInfos = salesOrderService.listWaitPrintOrderNum();
+            if (postInfos != null && !postInfos.isEmpty()) {
+                for (PostInfo temp : postInfos) {
+                    LogisticsInfo info = new LogisticsInfo();
+                    info.setLogisticsRstCode(temp.getPostFirm());
+                    List<LogisticsInfo> logisticsInfos = salesOrderService.getLogisticsInfo(info);
+                    if (logisticsInfos == null || logisticsInfos.size() <= 0) {
+                        errorOrderNum ++;
+                        continue;
+                    }
+                    String key = logisticsInfos.get(0).getLogisticsName();
+                    postMap.put(key, temp.getNumber());
                 }
-                String key = logisticsInfos.get(0).getLogisticsName();
-                postMap.put(key, temp.getNumber());
             }
-        }
-
         List<ProductColor> productColorList = productService.listproductAndColor(new ProductColor());
 
         salesOrder.setSalesOrderItemList(null);
-        ModelAndView mv = new ModelAndView("order/salesOrder/list_wait_send_order");
+
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .setModelAndView(salesOrder, mv, "/admin/await_send/listAwaitSendOrder", pagedResult);

watero-rst-web/src/main/resources/platform.properties

@@ -93,7 +93,7 @@ appSecret=39c8f8742c3f084e1da5b75520436a70
 #appSecret=97b2f2991e4ff0f2567fbc625f858377
 
 # wechat auth back url
-WECHAT_BACK_URL=http://rst.iamberry.com/wechatBack
+WECHAT_BACK_URL=http://test.iamberry.com/wechatBack
 
 # index redirect url
 redirectUrl_index=redirect:/wechat/index
@@ -110,6 +110,6 @@ scanningQrCode=https://w.iamberry.com/tooth/wechat/qr/
 ReqURL=http://api.kdniao.com/api/Eorderservice
 #ReqURL=http://testapi.kdniao.cc:8081/api/EOrderService
 
-DO_MAIN=rst.iamberry.com
+DO_MAIN=test.iamberry.com
 
 

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -176,6 +176,9 @@
 
 		<typeAlias type="com.iamberry.rst.core.order.OrderCorrectInfo" alias="OrderCorrectInfo"/>
 		<typeAlias type="com.iamberry.rst.core.order.OrderCorrectItem" alias="OrderCorrectItem"/>
+
+		<typeAlias type="com.iamberry.rst.core.order.OrderWarehouse" alias="OrderWarehouse"/>
+		<typeAlias type="com.iamberry.rst.core.order.OrderWarehouseAdmin" alias="OrderWarehouseAdmin"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -17,6 +17,11 @@
         .table-bg thead th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-order{left: 0px;cursor:pointer; position: absolute;border-bottom: 1px solid rgb(255, 255, 255);float: left;width: 110px;height: 36px;}
+
+        .radio-box input[type=radio]{position: relative;-webkit-appearance: none;appearance: none;cursor: pointer;width: 17px;height: 17px;border: 1px solid #333;border-radius: 50%;}
+        .radio-box input[type=radio]:focus {outline: none;}
+        .radio-box input[type=radio]:checked{background: #fff;}
+        .radio-box input[type=radio]:checked:after {content: '';position: absolute;width: 11px;height: 11px;left: 2px;top: 2px;background: #333;border-radius: 50%;}
     </style>
 </head>
 <body>
@@ -244,7 +249,7 @@
                         <a class="allocation_logistics_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
                             <i class="Hui-iconfont">&#xe669;</i>
                         </a>
-                        <a class="notice_distribution_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="通知配货" onclick="noticeOneOrderSend(${order.salesId})">
+                        <a class="notice_distribution_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="通知配货" onclick="chooseWarehouse(${order.salesId})">
                             <i class="Hui-iconfont">&#xe62f;</i>
                         </a>
                         <a class="manual_ship_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="手动发货" onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${order.salesId}','570','450');">
@@ -280,14 +285,33 @@
             <div style="float: left;margin-top: 20px;">
                 <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
                 <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="distribution_express(null)">分配物流</button>
-                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="noticeDistribution()">通知配货</button>
+                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="chooseWarehouse(null)">通知配货</button>
                 <button type="button" onClick="upFiles2();"  class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;">上传发货信息</button>
                 <button onClick="downloadOrderPage();" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" type="button" title="下载订单">下载订单</button>
             </div>
         </#if>
     </div>
 </div>
-
+<div style="display: none">
+<div id="warehouse">
+    <div class="row cl"  style="width: 500px;height: 200px;margin-left: 35px;">
+        <div style="background-color: #7f9db9;margin-left: 10px;width: 200px;height: 150px;float:left;margin-left: 60px;">
+            <div class="radio-box" style="margin: 10px">
+                <input  type="radio" id="warehouseId-1" name="warehouseId" value="1" checked>
+                <label for="warehouseId-1"><strong>正常销售仓库</strong></label><br>
+                <span>正常的销售订单，以及含有非优尼雅生产的产品订单</span>
+            </div>
+        </div>
+        <div class="radioDiv" style="background-color: #7f9db9;margin-left: 10px;width: 200px;height: 150px;float:left;">
+            <div class="radio-box" style="margin: 10px">
+                <input type="radio" id="warehouseId-2" name="warehouseId" value="2" >
+                <label for="warehouseId-2"><strong>售后订单仓库</strong></label><br>
+                <span>WaterO净水机产品维修，选择售后仓库</span>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
 <tfoot>
 <#include "/base/page_util.ftl">
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
@@ -296,6 +320,16 @@
 <script type="text/plain" id="upload_ue"></script>
 </tfoot>
 <script type="text/javascript">
+    $(document).on('click', ".radio-box", function() {
+        $(this).find("input").get(0).checked=true;
+    });
+
+    $('.skin-minimal input').iCheck({
+        checkboxClass: 'icheckbox-blue',
+        radioClass: 'iradio-blue',
+        increaseArea: '20%'
+    });
+
     /*判断上传类型 1：上传excel推送订单   2:下载订单  2:上传efast物流信息excel */
     var editorType;
     var _editor;
@@ -372,13 +406,40 @@
         layer_show(title,url,w,h);
     }
 
+
+    
+    function chooseWarehouse(id) {
+        layer.open({
+            type: 1
+            , title: "选择仓库" //不显示标题栏
+            , closeBtn: false
+            , area: ['600px', '300px']
+            , shade: 0.8
+            , id: 'LAY_layuipro' //设定一个id，防止重复弹出
+            , btn: ['确认', '取消']
+            , btnAlign: 'c'
+            , moveType: 1 //拖拽模式，0或者1
+            , content: $('#warehouse').html()
+            ,yes: function(index){
+                var warehouseId = $('input:radio[name="warehouseId"]:checked').val();
+                layer.close(index);
+                if(id == null){
+                    noticeDistribution(warehouseId);
+                }else{
+                    noticeOneOrderSend(id,warehouseId)
+                }
+
+            }
+        })
+    }
     /* 通知配货 */
-    function noticeOneOrderSend(id) {
+    function noticeOneOrderSend(id,warehouseId) {
         $.ajax({
             type:'POST',
             url: '${path}/admin/salesOrder/notice_distribution',
             data:{
-                "salesOrderIds" : id
+                "salesOrderIds" : id,
+                "warehouseId" : warehouseId
             },
             dataType: 'json',
             success:function(res) {
@@ -527,7 +588,7 @@
         /**
          *  通知配货
          */
-        function noticeDistribution() {
+        function noticeDistribution(warehouseId) {
             var index = layer.load(1, {
                 shade: [0.5,'#fff'] //0.1透明度的白色背景
             });
@@ -546,7 +607,8 @@
                 type:'POST',
                 url: '${path}/admin/salesOrder/notice_distribution',
                 data:{
-                    "salesOrderIds" : salesOrderIds
+                    "salesOrderIds" : salesOrderIds,
+                    "warehouseId" : warehouseId
                 },
                 dataType: 'json',
                 success:function(res) {

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

@@ -173,6 +173,7 @@
             var produceModel =  produce.produceModel;        //获取产品型号后两位
             var produceName = produce.produceName;            //获取产品名称
             var produceBrand = produce.produceBrand;            //获取品牌字母
+            var isPrintQrcode = produce.isPrintQrcode;            //是否需要打印二维码 1是 2 否
             produceCreateTime = formatDate(new Date());
             var machineNo = "NO." + $("#"+machineBarcode+"Id").val();
             for (var i = 0; i < settingNumber; i++) {
@@ -180,7 +181,7 @@
                 var barcodes = $("#bcTarget").html();
                 /*$("#barcodeId").html(machineBarcode);
                 $("#qrcodeImg").attr('src',machineQrcode);*/
-                if (produceName.indexOf("富氢") != -1 || produceName.indexOf("诺米克") != -1) {
+                if (isPrintQrcode == 2) {
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                         '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
@@ -349,12 +350,14 @@
         var produceModel =  produce.produceModel;        //获取产品型号后两位
         var produceName = produce.produceName;            //获取产品名称
         var produceBrand = produce.produceBrand;            //获取品牌字母
+        var isPrintQrcode = produce.isPrintQrcode;            //是否需要打印二维码 1是 2 否
         produceCreateTime = formatDate(new Date());
         for (var i=0;i<settingNumber;i++){
             code128(machineBarcode);
             var barcodes = $("#bcTarget").html();
 
-            if (produceName.indexOf("富氢") != -1 || produceName.indexOf("诺米克") != -1) {
+            /*if (produceName.indexOf("富氢") != -1 || produceName.indexOf("诺米克") != -1) {*/
+            if (isPrintQrcode == 2) {
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                         '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                         '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
@@ -398,6 +401,7 @@
         produce.produceModel = "";
         produce.produceFeature = "";
         produce.produceName = "";
+        produce.isPrintQrcode = "";
         $.ajax({
             type: "POST",
             url: "${path}/admin/machine/_getProduce_print",
@@ -409,6 +413,7 @@
                     produce.produceModel = data.produceModel;
                     produce.produceFeature = data.produceFeature;
                     produce.produceName = data.produceName;
+                    produce.isPrintQrcode = data.isPrintQrcode;
                 }
             },
             error: function(){