产品新增发货仓库，京东仓与优尼雅

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productColorMapper.xml

@@ -15,6 +15,7 @@
         <result    column="color_update_time"    property="colorUpdateTime" />
         <result    column="color_is_machine"    property="colorIsMachine" />
         <result    column="color_is_weight"    property="colorIsWeight" />
+        <result    column="color_is_jd_auto"    property="colorIsJdAuto" />
         <result    column="inventory_good_product_num"    property="inventoryGoodProductNum" />
     </resultMap>
     <sql    id="Base_List" >
@@ -95,7 +96,8 @@
         color_status,
         color_cretae_time,
         color_is_machine,
-        color_is_weight
+        color_is_weight,
+        color_is_jd_auto
         )
         values
         (
@@ -109,7 +111,8 @@
         #{colorStatus},
         #{colorCretaeTime},
         #{colorIsMachine},
-        #{colorIsWeight}
+        #{colorIsWeight},
+        #{colorIsJdAuto}
         )
     </insert>
     <update id="update" parameterType="ProductColor" >
@@ -147,7 +150,10 @@
                 color_is_machine = #{colorIsMachine},
             </if >
             <if test="colorIsWeight != null ">
-                color_is_weight = #{colorIsWeight}
+                color_is_weight = #{colorIsWeight},
+            </if >
+            <if test="colorIsJdAuto != null ">
+                color_is_jd_auto = #{colorIsJdAuto}
             </if >
         </set >
         where color_id= #{colorId}
@@ -173,7 +179,8 @@
         color_is_machine,
         color_jd_product_id,
         color_mode,
-        color_is_weight
+        color_is_weight,
+        color_is_jd_auto
         )
         values
         <foreach collection="list" item="node" index="index" separator="," open="" close="">
@@ -190,7 +197,8 @@
             #{node.colorIsMachine},
             #{node.colorJdProductId},
             #{node.colorMode},
-            #{node.colorIsWeight}
+            #{node.colorIsWeight},
+            #{node.colorIsJdAuto}
             )
         </foreach >
     </insert>
@@ -233,6 +241,9 @@
                 <if test="node.colorIsWeight != null ">
                     color_is_weight = #{node.colorIsWeight},
                 </if >
+                <if test="node.colorIsJdAuto != null ">
+                    color_is_jd_auto = #{node.colorIsJdAuto},
+                </if >
                 <if test="node.colorJdProductId != null and node.colorJdProductId != ''">
                     color_jd_product_id = #{node.colorJdProductId}
                 </if >

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

@@ -240,7 +240,7 @@
                             <#list order.salesOrderItemList as item>
                                 <tr class="text-c">
                                     <input type="hidden" class="item_id" id="" value="${item.itemId}">
-                                    <input type="hidden" class="item_other_id" id="" value="${item.itemOtherId}">
+                                    <input type="hidden" class="item_other_id" id="" value="${item.itemOtherId!''}">
                                     <input type="hidden" class="color_id" id="" value="${item.itemColorId}">
                                     <input type="hidden" class="item_color_bar" id="" value="${item.itemColorBar}">
                                     <input type="hidden" class="color_price" id="" value="${((item.itemProductPrice/100)?string("0.##"))!''}" >

watero-rst-web/src/main/webapp/WEB-INF/views/product/add_product.ftl

@@ -220,6 +220,7 @@
                                 <th style="text-align: center;" width="10"><span class="c-red">*</span>重量(g)</th>
                                 <th style="text-align: center;" width="10">型号</th>
                                 <th style="text-align: center;" width="10"><span class="c-red">*</span>是否为水机</th>
+                                <th style="text-align: center;" width="10"><span class="c-red">*</span>发货仓库</th>
                                 <th style="text-align: center;" width="10"><span class="c-red">*</span>状态</th>
                                 <th style="text-align: center;" width="20">图片</th>
                                 <th style="text-align: center;" width="20">库存</th>
@@ -227,7 +228,7 @@
                             </tr>
                         </thead>
                         <tbody id="add_color_id">
-                            <tr><td colspan="13" class="td-manage text-c" >暂时没有颜色，请添加！</td></tr>
+                            <tr><td colspan="15" class="td-manage text-c" >暂时没有颜色，请添加！</td></tr>
                         </tbody>
                     </table>
 
@@ -295,14 +296,26 @@
 
                 <div class="row cl" id="" style="">
                     <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>是否为水机：</label>
-                    <div class="formControls col-5 col-sm-5 skin-minimal">
+                    <div class="formControls col-2 col-sm-2 skin-minimal">
                         <div class="radio-box">
                             <input type="radio" class="colorIsMachine" id="colorIsMachine-1" name="colorIsMachine" value="1" >
-                            <label for="colorIsMachine-1">水机产品</label>
+                            <label for="colorIsMachine-1">水机</label>
                         </div>
                         <div class="radio-box">
                             <input type="radio" class="colorNoMachine" id="colorIsMachine-2" name="colorIsMachine" value="2" checked>
-                            <label for="colorIsMachine-2">其他产品</label>
+                            <label for="colorIsMachine-2">其他</label>
+                        </div>
+                    </div>
+
+                    <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>发货渠道：</label>
+                    <div class="formControls col-2 col-sm-2 skin-minimal">
+                        <div class="radio-box">
+                            <input type="radio" class="colorIsJdAuto" id="colorIsJdAuto-1" name="colorIsJdAuto" value="1" >
+                            <label for="colorIsJdAuto-1">京东仓</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" class="colorNoJdAuto" id="colorIsJdAuto-2" name="colorIsJdAuto" value="2" checked>
+                            <label for="colorIsJdAuto-2">优尼雅</label>
                         </div>
                     </div>
                 </div>

watero-rst-web/src/main/webapp/WEB-INF/views/product/update_product.ftl

@@ -233,6 +233,7 @@
                             <th  width="10"><span class="c-red">*</span>重量(g)</th>
                             <th  width="10">型号</th>
                             <th  width="10"><span class="c-red">*</span>是否为水机</th>
+                            <th style="text-align: center;" width="10"><span class="c-red">*</span>发货仓库</th>
                             <th  width="10"><span class="c-red">*</span>状态</th>
                             <th  width="20">图片</th>
                             <th  width="20">库存</th>
@@ -259,6 +260,10 @@
                                             <span class="colorIsMachineMsg"><#if productColor.colorIsMachine==1>水机产品</#if><#if productColor.colorIsMachine==2>其他产品</#if></span>
                                             <input type="hidden" class="colorIsMachine" value="${productColor.colorIsMachine!''}">
                                         </td>
+                                        <td width="10">
+                                            <span class="colorIsJdAutoMsg"><#if productColor.colorIsJdAuto==1>京东仓</#if><#if productColor.colorIsJdAuto==2>优尼雅</#if></span>
+                                            <input type="hidden" class="colorIsJdAuto" value="${productColor.colorIsJdAuto!''}">
+                                        </td>
                                         <td width="10" >
                                             <span class="colorStatusMsg"><#if productColor.colorStatus==1>使用</#if><#if productColor.colorStatus==2>禁用</#if></span>
                                             <input type="hidden" class="colorStatus" value="${productColor.colorStatus!''}">
@@ -344,14 +349,26 @@
 
                 <div class="row cl" id="" style="">
                     <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>是否为水机：</label>
-                    <div class="formControls col-5 col-sm-5 skin-minimal">
+                    <div class="formControls col-2 col-sm-2 skin-minimal">
                         <div class="radio-box">
                             <input type="radio" class="colorIsMachine" id="colorIsMachine-1" name="colorIsMachine" value="1" >
-                            <label for="colorIsMachine-1">水机产品</label>
+                            <label for="colorIsMachine-1">水机</label>
                         </div>
                         <div class="radio-box">
                             <input type="radio" class="colorNoMachine" id="colorIsMachine-2" name="colorIsMachine" value="2" checked>
-                            <label for="colorIsMachine-2">其他产品</label>
+                            <label for="colorIsMachine-2">其他</label>
+                        </div>
+                    </div>
+
+                    <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>发货渠道：</label>
+                    <div class="formControls col-2 col-sm-2 skin-minimal">
+                        <div class="radio-box">
+                            <input type="radio" class="colorIsJdAuto" id="colorIsJdAuto-1" name="colorIsJdAuto" value="1" >
+                            <label for="colorIsJdAuto-1">京东仓</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" class="colorNoJdAuto" id="colorIsJdAuto-2" name="colorIsJdAuto" value="2" checked>
+                            <label for="colorIsJdAuto-2">优尼雅</label>
                         </div>
                     </div>
                 </div>

watero-rst-web/src/main/webapp/common/js/product/product.js

@@ -40,6 +40,15 @@ function add_color(isUpdate){
         }
         colorHtml += '<td width="40" ><span class="colorIsMachineMsg">'+colorIsMachineStr+'</span><input type="hidden" class="colorIsMachine" name="colorIsMachine" id="colorIsMachine" value="'+ colorIsMachine +'"></td>';
 
+        var colorIsJdAuto = $(':radio[name="colorIsJdAuto"]:checked').val();
+        var colorIsJdAutoStr = '';
+        if(colorIsJdAuto == 1){
+            colorIsJdAutoStr = '京东仓';
+        }else{
+            colorIsJdAutoStr = '优尼雅';
+        }
+        colorHtml += '<td width="40" ><span class="colorIsJdAutoMsg">'+colorIsJdAutoStr+'</span><input type="hidden" class="colorIsJdAuto" name="colorIsJdAuto" id="colorIsJdAuto" value="'+ colorIsJdAuto +'"></td>';
+
         var colorStatus = $(':radio[name="colorStatus"]:checked').val();
         var colorStatusStr = '';
         if(colorStatus == 1){
@@ -104,6 +113,16 @@ function add_color(isUpdate){
                 }
                 $(this).find(".colorIsMachineMsg").html(colorIsMachineStr);
 
+                var colorIsJdAuto = $(':radio[name="colorIsJdAuto"]:checked').val();
+                $(this).find(".colorIsJdAuto").val(colorIsJdAuto);
+                var colorIsJdAutoStr = '';
+                if(colorIsJdAuto == 1){
+                    colorIsJdAutoStr = '京东仓';
+                }else{
+                    colorIsJdAutoStr = '优尼雅';
+                }
+                $(this).find(".colorIsJdAutoMsg").html(colorIsJdAutoStr);
+
                 var colorStatus = $(':radio[name="colorStatus"]:checked').val();
                 $(this).find(".colorStatus").val(colorStatus);
                 var colorStatusStr = '';
@@ -330,6 +349,7 @@ function getColorList(){
         color.colorMode = cufte($(this).find(".colorMode").html());
         color.colorPicture = cufte($(this).find(".colorPicture").val());
         color.colorIsMachine = cufte($(this).find('.colorIsMachine').val());
+        color.colorIsJdAuto = cufte($(this).find('.colorIsJdAuto').val());
         color.colorStatus = cufte($(this).find('.colorStatus').val());
         color.inventoryGoodProductNum = cufte($(this).find('.colorInventory').html());
         colorList.push(color);
@@ -400,6 +420,13 @@ function updTr($this) {
         $(".colorNoMachine").iCheck('check');
     }
 
+    var colorIsJdAuto = $this.find('.colorIsJdAuto').val();
+    if(colorIsJdAuto == 1){
+        $(".colorIsJdAuto").iCheck('check');
+    }else{
+        $(".colorNoJdAuto").iCheck('check');
+    }
+
     var colorStatus = $this.find('.colorStatus').val();
     if(colorStatus == 1){
         $(".colorIsStatus").iCheck('check');