增加戈登的二维码打印

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

@@ -2296,7 +2296,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             salesPayMoney += soi.getItemTotal();
         }
 
-        if(salesOrder != null){
+        if(salesOrder != null && salesOrder.getSalesStoreId() != 40){
             salesOrder.setSalesAmount(salesAmount);
             salesOrder.setSalesPayMoney(salesPayMoney);
         }

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

@@ -2021,6 +2021,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                         }
                         //处理客户信息-结束
                         String[] detectIds = {};
+                        logger.info("修改数据:{}", com.alibaba.fastjson.JSONObject.toJSONString(salesOrder));
                         salesOrderService.addRstOrderinfo(salesOrder,new ArrayList<SalesOrder>(),detectIds);
                         //添加操作跟踪记录
                         OrderTracking orderTracking = new OrderTracking();

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_order_list.ftl

@@ -104,7 +104,7 @@
                         </span>
                      </div>
 
-                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 150px;" > <span class="select-box">
+                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 150px;display: none" > <span class="select-box">
                         <select name="orderIscostTotal" class="select" id="orderIscostTotal"  >
                              <option value ="">是否认领</option>
                              <option <#if (salesOrder.orderIscostTotal)??><#if salesOrder.orderIscostTotal == 1>selected="selected"</#if></#if> value ="1" >已认领</option>
@@ -235,7 +235,10 @@
         });
 
         var dealerId = cufte($("#dealerId").val());
-        var salesExOrderId = cufte($("#salesExOrderId").val());
+        var salesExOrderId = ($("#salesExOrderId").val());
+        if (!isEmpty(salesExOrderId)) {
+            salesExOrderId = undefined;
+        }
         var salesStoreId = cufte($("#storeId").val());
         var salesOrderStatus = cufte($("#salesOrderStatus").val());
         var salesStatus = cufte($("#salesStatus").val());
@@ -244,7 +247,7 @@
         var salesAddressTel = cufte($("#salesAddressTel").val());
         var salesOrderId = cufte($("#salesOrderId").val());
         var colorId = cufte($("#colorId").val());
-        var orderIscostTotal = cufte($("#orderIscostTotal").val());
+        var orderIscostTotal = undefined;
         var salesReturnGoods = cufte($("#salesReturnGoods").val());
         var startDate = cufte($("#startDate").val());
         var endDate = cufte($("#endDate").val());
@@ -254,15 +257,12 @@
                 dealerId : dealerId,
                 salesStoreId : salesStoreId,
                 salesOrderStatus : salesOrderStatus,
-                salesStatus : salesStatus,
                 salesId : salesId,
                 salesOrderId : salesOrderId,
                 salesAddressName : salesAddressName,
                 salesAddressTel : salesAddressTel,
                 colorId : colorId,
                 orderIscostTotal : orderIscostTotal,
-                isCustmerAddOrder : 2,
-                isSelectCustomer : 2,
                 salesReturnGoods : salesReturnGoods,
                 startDate : startDate,
                 endDate : endDate,