京东订单拉取，京东订单发货方法更改为京东仓发货，

订单核对不再核对京东仓发货的订单
修复修改产品bug

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

@@ -23,7 +23,7 @@ public class SalesOrder implements Serializable {
     private Integer salesPledgeMoney;       //押金金额
     private Integer salesRemainDeposit;     //待提取金额
     private Integer salesStatus;            //确认状态  0(未确认)1(确认)2(挂起)3(作废) 4:京东自发
-    private Integer salesSendType;          //送货方式 1:线下送货，2：物流发货
+    private Integer salesSendType;          //送货方式 1:线下送货，2：物流发货 3:京东仓发货
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesSendTime;             //发货时间

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

@@ -2601,13 +2601,15 @@
     </select>
     <!--查询拣货单信息-->
     <select id="getPickingOrders" parameterType="OrderStatisticsInfo" resultType="OrderStatisticsInfo">
-        SELECT soi.item_product_name AS productName,soi.item_product_color AS  colorName,sum(soi.item_num) AS num FROM tb_rst_sales_order_item soi
+        SELECT soi.item_product_name AS productName,soi.item_product_color AS  colorName,sum(soi.item_num) AS num
+        FROM tb_rst_sales_order_item soi
         LEFT JOIN tb_rst_sales_order_info oi on soi.item_order_id = oi.sales_id
         WHERE
         sales_status != 3
         AND sales_batch_id != 'KS00000000000001'
         AND sales_send_time > #{pickingStartDate} AND  sales_send_time &lt; NOW()
         AND sales_warehouse_id = #{warehouseId}
+        AND sales_send_type != 3
         GROUP BY soi.item_color_id
         ORDER BY num desc
     </select>
@@ -2620,6 +2622,7 @@
         AND sales_batch_id != 'KS00000000000001'
         AND sales_send_time > #{checkStartDate} AND  sales_send_time &lt; NOW()
         AND sales_warehouse_id = #{warehouseId}
+        AND sales_send_type != 3
         GROUP BY oi.sales_post_firm
         ORDER BY num desc
     </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -1466,6 +1466,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                     //京东仓自发 && 京东店铺
                                     salesOrder.setSalesStatus(4);  //4:京东自发
                                 }
+                                salesOrder.setSalesSendType(3); //3:京东仓发货
                             }
 
                             Long orderItemId = item.getLong("orderItemId"); //小亚通订单项编号

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

@@ -91,7 +91,7 @@
 
                 <label class="form-label col-1 col-sm-1">产品型号：</label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="${product.productAbbreviation!''}" placeholder="填写产品型号" id="productNumber" name="productNumber" datatype="*0-15" errormsg="产品型号格式不正确！">
+                    <input type="text" class="input-text" value="${product.productNumber!''}" placeholder="填写产品型号" id="productNumber" name="productNumber" datatype="*0-15" errormsg="产品型号格式不正确！">
                 </div>
             </div>