Browse Source

5. 工厂生产管理

liujiankang 5 years ago
parent
commit
4ac5fc3699

+ 9 - 0
watero-rst-core/src/main/java/com.iamberry.rst.core/order/DeliveryStrategy.java

@@ -15,6 +15,7 @@ public class DeliveryStrategy implements Serializable {
     private Date strategyUpdateDate;
     private Date strategyCreateDate;
     private Integer strategyStatus;
+    private Integer strategyProductId;
 
     private String strategyCompanyName;
     private String strategyStoreName;
@@ -102,6 +103,14 @@ public class DeliveryStrategy implements Serializable {
         this.strategyStatus = strategyStatus;
     }
 
+    public Integer getStrategyProductId() {
+        return strategyProductId;
+    }
+
+    public void setStrategyProductId(Integer strategyProductId) {
+        this.strategyProductId = strategyProductId;
+    }
+
     public String getStrategyCompanyName() {
         return strategyCompanyName;
     }

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

@@ -761,8 +761,26 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         List<DeliveryStrategy> trategyList = deliveryStrategyMapper.getPriorityList(deliveryStrategy);
         for (SalesOrder salesOrder:listSalesOrder) {
             for(DeliveryStrategy strategy : trategyList){
+                if(salesOrder.getSalesCompanyId().equals(strategy.getStrategyCompanyId())){
+                    if(salesOrder.getSalesStoreId().equals(strategy.getStrategyStoreId()) || strategy.getStrategyStoreId() == 0){
+                        if(strategy.getStrategyProvinceNumber() == 0 || (salesOrder.getSalesAddressInfo().indexOf(strategy.getStrategyProvinceName()))!=-1){
+                            //判断产品
+                            for(SalesOrderItem salesOrderItem : salesOrder.getSalesOrderItemList()){
+                                if(strategy.getStrategyProductId() == 0){
+                                        salesOrder.setSalesPostFirm(strategy.getStrategyPostFirm());
+                                        return;
+                                }else if(salesOrderItem.getItemProductId().equals(strategy.getStrategyProductId())){
+                                    if(strategy.getStrategyColorId() == 0 || salesOrderItem.getItemColorId().equals(strategy.getStrategyColorId())){
+                                        salesOrder.setSalesPostFirm(strategy.getStrategyPostFirm());
+                                        return;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
                 //判断销售公司、销售店铺,地区(省)
-                if(salesOrder.getSalesCompanyId().equals(strategy.getStrategyCompanyId()) && salesOrder.getSalesStoreId().equals(strategy.getStrategyStoreId()) && (salesOrder.getSalesAddressInfo().indexOf(strategy.getStrategyProvinceName()))!=-1){
+               /* if(salesOrder.getSalesCompanyId().equals(strategy.getStrategyCompanyId()) && salesOrder.getSalesStoreId().equals(strategy.getStrategyStoreId()) && (salesOrder.getSalesAddressInfo().indexOf(strategy.getStrategyProvinceName()))!=-1){
                     //判断产品
                     for(SalesOrderItem salesOrderItem : salesOrder.getSalesOrderItemList()){
                         if(salesOrderItem.getItemColorId().equals(strategy.getStrategyColorId())){
@@ -770,7 +788,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                             return;
                         }
                     }
-                }
+                }*/
             }
         }
         }

+ 1 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -854,7 +854,7 @@
         LEFT JOIN tb_rst_address_district ad on ad.district_id = cs.signclosed_addr_area
         WHERE
             cd.customer_id = #{customerId}
-        AND detect_state in (32,33,36,37)  AND detect_placeorder = 1
+        AND detect_state in (32,33,36,37,39)  AND detect_placeorder = 1
   </select>
 
 

+ 13 - 4
watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/deliveryStrategyMapper.xml

@@ -14,6 +14,7 @@
         strategy_status,
         strategy_update_date,
         strategy_create_date,
+        strategy_product_id,
         sc.company_name strategyCompanyName,
         si.store_name strategyStoreName,
         ap.province strategyProvinceName,
@@ -24,7 +25,7 @@
         LEFT JOIN tb_rst_store_info si on ds.strategy_store_id = si.store_id
         LEFT JOIN tb_rst_address_province ap on ds.strategy_province_number = ap.division_code
         LEFT JOIN tb_rst_product_color pc on ds.strategy_color_id = pc.color_id
-        LEFT JOIN tb_rst_product_info pi on pc.color_product_id = pi.product_id
+        LEFT JOIN tb_rst_product_info pi on ds.strategy_product_id = pi.product_id
         <where>
             <if test="strategyStatus != null ">
                 AND strategy_status = #{strategyStatus}
@@ -47,6 +48,7 @@
         strategy_status,
         strategy_update_date,
         strategy_create_date,
+        strategy_product_id,
         sc.company_name strategyCompanyName,
         si.store_name strategyStoreName,
         ap.province strategyProvinceName,
@@ -72,7 +74,8 @@
         strategy_priority,
         strategy_post_firm,
         strategy_status,
-        strategy_create_date
+        strategy_create_date,
+        strategy_product_id
         )
         values
         (
@@ -83,7 +86,8 @@
         #{strategyPriority},
         #{strategyPostFirm},
         #{strategyStatus},
-        #{strategyCreateDate}
+        #{strategyCreateDate},
+        #{strategyProductId}
         )
     </insert>
     <update id="update" parameterType="DeliveryStrategy" >
@@ -111,6 +115,9 @@
             <if test="strategyStatus != null and strategyStatus != ''">
                 strategy_status = #{strategyStatus}
             </if >
+            <if test="strategyProductId != null and strategyProductId != ''">
+                strategy_product_id = #{strategyProductId}
+            </if >
         </set >
         where strategy_id = #{strategyId}
     </update>
@@ -131,7 +138,8 @@
         strategy_post_firm,
         strategy_status,
         strategy_update_date,
-        strategy_create_date
+        strategy_create_date,
+        strategy_product_id
         from tb_rst_order_delivery_strategy
         <where>
             <if test="strategyPriority != null ">
@@ -154,6 +162,7 @@
         strategy_status,
         strategy_update_date,
         strategy_create_date,
+        strategy_product_id,
         ap.province strategyProvinceName
         from tb_rst_order_delivery_strategy ds
         LEFT JOIN tb_rst_address_province ap on ds.strategy_province_number = ap.division_code

+ 7 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/DeliveryStrategyController.java

@@ -163,12 +163,17 @@ public class DeliveryStrategyController {
         List<Product> productList = productService.listProductAndColorAndfittings(product);
         ProductColor color = productService.getProduceColor(deliveryStrategy.getStrategyColorId());
         ProductColor productColor = new ProductColor();
-        productColor.setColorProductId(color.getColorProductId());
+        if(color == null){
+            productColor.setColorProductId(productList.get(0).getProductId());
+        }else{
+            productColor.setColorProductId(color.getColorProductId());
+        }
+
         List<ProductColor> productColorList = productService.listProduceColor(productColor);
         List<LogisticsInfo> logisticsInfoList =  logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
         mv.addObject("logisticsInfoList",logisticsInfoList);
         mv.addObject("productColorList",productColorList);
-        mv.addObject("productId",color.getColorProductId());
+        mv.addObject("productId",deliveryStrategy.getStrategyProductId());
         mv.addObject("productList",productList);
         mv.addObject("storeInfoList", storeInfoList);
         mv.addObject("companyInfoList",companyInfoList);

+ 3 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl

@@ -793,6 +793,7 @@
                                         <#if informationInfo.feeOriginally == 1>以旧换新</#if>
                                         <#if informationInfo.feeOriginally == 2>机器维修</#if>
                                         <#if informationInfo.feeOriginally == 3>机器运费</#if>
+                                        <#if informationInfo.feeOriginally == 4>退货折旧</#if>
                                     </#if>
                                 </td>
                                 <td>
@@ -860,6 +861,7 @@
                                                     <option value="1">以旧换新</option>
                                                     <option value="2">机器维修</option>
                                                     <option value="3">机器运费</option>
+                                                    <option value="4">退货折旧</option>
                                                 </select>
                                         </span>
                                     </div>
@@ -949,6 +951,7 @@
                                                     <option value="1">以旧换新</option>
                                                     <option value="2">机器维修</option>
                                                     <option value="3">机器运费</option>
+                                                    <option value="4">退货折旧</option>
                                                 </select>
                                         </span>
                                     </div>

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

@@ -264,9 +264,11 @@
                         <a class="confirm_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="确认订单" alt="确认订单" onclick="confirm_one(${order.salesId!''})">
                             <i class="Hui-iconfont">&#xe615;</i>
                         </a>
-                        <a class="edit_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="修改订单" alt="修改订单" onclick="sales_order_update(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe6df;</i>
-                        </a>
+                        <#if order.salesShippingStatus != 1>
+                            <a class="edit_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="修改订单" alt="修改订单" onclick="sales_order_update(${order.salesId!''})">
+                                <i class="Hui-iconfont">&#xe6df;</i>
+                            </a>
+                        </#if>
                         <a class="order_cancel_distribution" style="text-decoration:none;display: none" href="javascript:void(0);" title="撤销配货" alt="撤销配货" onclick="cancelDistribution(${order.salesId!''})">
                             <i class="Hui-iconfont">&#xe66b;</i>
                         </a>

+ 7 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/order/strategy/add_deliveryStrategy.ftl

@@ -65,7 +65,7 @@
                             </#if>
                 </select>
                 <select id="storeId" class="my-select" name="strategyStoreId" style="width: 195px">
-                    <option value="">选择销售店铺</option>
+                    <option value="0">所有店铺</option>
                             <#if storeList?? &&  (storeList?size > 0) >
                                 <#list storeList as type>
                                     <option value ="${type.storeId!}">${type.storeName!}</option>
@@ -78,7 +78,7 @@
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>地址:</label>
             <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;">
                 <select id="strategyProvinceNumber" class="my-select" name="strategyProvinceNumber" style="width: 195px">
-                    <option value="">选择省份</option>
+                    <option value="0">所有省份</option>
                             <#if provinceList?? &&  (provinceList?size > 0) >
                                 <#list provinceList as province>
                                     <option value ="${province.divisionCode!}">${province.province!}</option>
@@ -90,7 +90,8 @@
         <div class="row cl">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>产品:</label>
             <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;">
-                <select id="productId" name="productId" class="my-select" style="width: 195px">
+                <select id="productId" name="strategyProductId" class="my-select" style="width: 195px">
+                    <option value="0">所有产品</option>
                     <#if (productList?size > 0)>
                             <#list productList as product>
                                 <option value="${product.productId!""}" >${product.productName!""}</option>
@@ -99,6 +100,7 @@
                 </select>
 
                 <select id="productColorId" name="strategyColorId" class="my-select" style="width: 195px">
+                    <option value="0">所有颜色</option>
                     <#if (productColorList?size > 0)>
                         <#list productColorList as productColor>
                             <option value="${productColor.colorId!""}" >${productColor.colorName!""}</option>
@@ -211,7 +213,7 @@
             url: "${path}/admin/customer/select_storeInfo",
             success: function(data){
                 $("#storeId").empty();    //清空下拉框
-                $("#storeId").append("<option value=''>选择销售店铺</option>");
+                $("#storeId").append("<option value='0'>所有店铺</option>");
                 if (data.returnCode == 200) {
                     for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
                         var storeInfo = data.returnMsg.storeInfoList[i];
@@ -239,6 +241,7 @@
                 if (data.returnCode == 200) {
                     $("#productColorId").empty();
                     if(data.returnMsg.productColorList.length > 0){
+                        $("#productColorId").append("<option value='0'>所有颜色</option>");
                         for(var i=0;i<data.returnMsg.productColorList.length;i++){
                             var productColor = data.returnMsg.productColorList[i];
                             $("#productColorId").append('<option value='+productColor.colorId+'>'+productColor.colorName+'</option>');

+ 24 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/order/strategy/deliveryStrategy_List.ftl

@@ -45,9 +45,30 @@
 					<#list page.dataList as list>
 						<tr>
                             <td class="text-c" width="140">${list.strategyCompanyName!''}</td>
-							<td class="text-c" width="100">${list.strategyStoreName!''}</td>
-							<td class="text-c" width="100">${list.strategyProvinceName!''}</td>
-							<td class="text-c" width="100">${list.strategyProductName!''}-(${list.strategyColorName!''})</td>
+							<td class="text-c" width="100">
+                                <#if list.strategyStoreId == 0>
+                                    所有店铺
+                                <#else>
+                                    ${list.strategyStoreName!''}
+                                </#if>
+                            </td>
+							<td class="text-c" width="100">
+                            <#if list.strategyProvinceNumber == 0>
+                                    所有地区
+                            <#else>
+                                ${list.strategyProvinceName!''}
+                            </#if>
+                            </td>
+							<td class="text-c" width="100">
+                                <#if list.strategyProductId == 0>
+                                    所有产品
+                                <#elseif list.strategyColorId == 0 >
+                                    ${list.strategyProductName!''}-(所有颜色)
+                                <#else>
+                                    ${list.strategyProductName!''}-(${list.strategyColorName!''})
+                                </#if>
+                            </td>
+
 							<td class="text-c" width="100">${list.strategyPriority!''}</td>
 							<td class="text-c" width="100">${list.strategyPostFirm!''}</td>
 							<!-- 遍历操作 -->

+ 36 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/order/strategy/update_deliveryStrategy.ftl

@@ -65,7 +65,7 @@
                             </#if>
                 </select>
                 <select id="storeId" class="my-select" name="strategyStoreId" style="width: 195px">
-                    <option value="">选择销售店铺</option>
+                    <option value="0" <#if deliveryStrategy.strategyStoreId == 0>selected</#if>>所有店铺</option>
                             <#if storeInfoList?? &&  (storeInfoList?size > 0) >
                                 <#list storeInfoList as type>
                                     <option value ="${type.storeId!}" <#if deliveryStrategy.strategyStoreId == type.storeId>selected</#if>>${type.storeName!}</option>
@@ -78,7 +78,7 @@
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>地址:</label>
             <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;">
                 <select id="strategyProvinceNumber" class="my-select" name="strategyProvinceNumber" style="width: 195px">
-                    <option value="">选择省份</option>
+                    <option value="0" <#if deliveryStrategy.strategyProvinceNumber == 0>selected</#if>>所有省份</option>
                             <#if provinceList?? &&  (provinceList?size > 0) >
                                 <#list provinceList as province>
                                     <option value ="${province.divisionCode!}" <#if deliveryStrategy.strategyProvinceNumber == province.divisionCode>selected</#if>>${province.province!}</option>
@@ -90,7 +90,8 @@
         <div class="row cl">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>产品:</label>
             <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;">
-                <select id="productId" name="productId" class="my-select" style="width: 195px">
+                <select id="productId" name="strategyProductId" class="my-select" style="width: 195px">
+                    <option value="0" <#if deliveryStrategy.strategyProductId == 0>selected</#if>>所有产品</option>
                     <#if (productList?size > 0)>
                             <#list productList as product>
                                 <option value="${product.productId!""}" <#if productId == product.productId>selected</#if> >${product.productName!""}</option>
@@ -99,6 +100,7 @@
                 </select>
 
                 <select id="productColorId" name="strategyColorId" class="my-select" style="width: 195px">
+                    <option value="0" <#if deliveryStrategy.strategyColorId == 0>selected</#if>>所有颜色</option>
                     <#if (productColorList?size > 0)>
                         <#list productColorList as productColor>
                             <option value="${productColor.colorId!""}" <#if deliveryStrategy.strategyColorId == productColor.colorId>selected</#if> >${productColor.colorName!""}</option>
@@ -199,7 +201,7 @@
             url: "${path}/admin/customer/select_storeInfo",
             success: function(data){
                 $("#storeId").empty();    //清空下拉框
-                $("#storeId").append("<option value=''>选择销售店铺</option>");
+                $("#storeId").append("<option value='0'>所有店铺</option>");
                 if (data.returnCode == 200) {
                     for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
                         var storeInfo = data.returnMsg.storeInfoList[i];
@@ -211,6 +213,36 @@
             }
         });
     }
+    //查询产品颜色信息
+    $('#productId').change(function(){
+        getProduct($(this).children('option:selected').val());
+    })
+    function  getProduct(productId) {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/product/get_product",
+            data:{colorProductId:productId},// 你的formid
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    $("#productColorId").empty();
+                    if(data.returnMsg.productColorList.length > 0){
+                        $("#productColorId").append("<option value='0'>所有颜色</option>");
+                        for(var i=0;i<data.returnMsg.productColorList.length;i++){
+                            var productColor = data.returnMsg.productColorList[i];
+                            $("#productColorId").append('<option value='+productColor.colorId+'>'+productColor.colorName+'</option>');
+                        }
+                    }
+
+                }
+
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.msg('添加错误',{icon: 5,time:1000});
+            }
+        });
+    }
 </script>
 </body>
 </html>