优化订单列表展示

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

@@ -39,7 +39,7 @@ public class SalesOrder implements Serializable {
     private String salesAddressDesc;        //地址详情
     private String salesAddressTel;         //收件人电话
     private String salesAddressName;        //收件人姓名
-    private String salesAddressPostcode;        //收件人邮政编码
+    private String salesAddressPostcode;    //收件人邮政编码
     private Integer salesAmount;            //订单总金额
     private Integer salesPayMoney;          //已付金额 - 支付金额/折扣价
     private Integer salesPayType;           //付款方式  1：微信支付 2：现金支付3：已支付定金￥99 4：刷卡支付 5：支付宝支付

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

@@ -1453,11 +1453,10 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Override
     @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.REPEATABLE_READ)
     public synchronized Integer updateDeliver(SalesOrder salesOrder) {
-        Integer flag = 0;
         //修改出库状态
-        flag = salesOrderMapper.updateDeliver(salesOrder);
+        int flag = salesOrderMapper.updateDeliver(salesOrder);
         if(flag < 1){
-            throw new RuntimeException("出库失败,订单出库失败。");
+            throw new RuntimeException("操作失败,订单出/入库失败，请联系技术人员核查。");
         }
         //是否原机退回
         boolean isMachineRetuen = false;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -809,8 +809,8 @@ public class DmDealerController {
                 List<Object> row = new ArrayList<Object>();
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
                 row.add(salesOrder.getSalesCreateTime() == null ? null:formatter.format(salesOrder.getSalesCreateTime()));
-                row.add(salesOrder.getSalesOrderId() == null ? null:salesOrder.getSalesOrderId());
-                row.add(salesOrder.getSalesDealCode() == null ? null:salesOrder.getSalesDealCode());
+                row.add(salesOrder.getSalesOrderId());
+                row.add(salesOrder.getSalesDealCode());
                 if(salesOrder.getSalesCustomerId() == null){
                     row.add("正常订单");
                 }else{
@@ -818,24 +818,24 @@ public class DmDealerController {
                     row.add("售后订单（"+  typeName +"）");
                 }
 
-                row.add(salesOrder.getDealerName() == null ? null:salesOrder.getDealerName());
-                row.add(salesOrder.getDealChannelName() == null ? null:salesOrder.getDealChannelName());
-                row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
+                row.add(salesOrder.getDealerName());
+                row.add(salesOrder.getDealChannelName());
+                row.add(salesOrder.getStoreName());
                 if(salesOrder.getOrderIscostTotal() == 0){   //orderIscostTotal
                     row.add("未认领");
                 }else{
                     row.add("已认领");
                 }
 
-                row.add(salesOrder.getSalesAddressName() == null ? null:salesOrder.getSalesAddressName());
-                row.add(salesOrder.getSalesAddressTel() == null ? null:salesOrder.getSalesAddressTel());
-                row.add(salesOrder.getSalesAddressInfo() == null ? null:salesOrder.getSalesAddressInfo());
+                row.add(salesOrder.getSalesAddressName());
+                row.add(salesOrder.getSalesAddressTel());
+                row.add(salesOrder.getSalesAddressInfo());
                 String frim = replace(salesOrder.getSalesPostFirm());
                 row.add(frim);
-                row.add(salesOrder.getSalesPostNum() == null ? null:salesOrder.getSalesPostNum());
+                row.add(salesOrder.getSalesPostNum());
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName()+(salesOrder.getItemProductColor() == null ? null:"-"+salesOrder.getItemProductColor()));
-                row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
-                row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
+                row.add(salesOrder.getItemProductColor());
+                row.add(salesOrder.getItemNum());
 
                 if(salesOrder.getItemTotal() == null){
                     row.add(0);

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

@@ -282,7 +282,6 @@ public class AwaitSendController {
 
     /**
      * 打单发货,兼容多台打印机并发打印
-     * @param post
      * @param orderId
      * @param salesId
      * @param request
@@ -990,74 +989,16 @@ public class AwaitSendController {
     @RequiresPermissions("salesOrder:markDeliver:deliverList")
     @RequestMapping("/markDeliver")
     public ResponseJson markDeliver(HttpServletRequest request,Integer salesId, Integer type) {
-        ResponseJson rj = ResponseJson.getFAILURE();
-        if(salesId == null || type == null){
+        if(salesId == null || type == null || type != 2){
             return ResponseJson.getFAILURE();
         }
-
+        ResponseJson rj = ResponseJson.getFAILURE();
         SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesId);
         if(salesOrder == null){
             rj.setResultMsg("标记失败，该订单号未查询到订单。");
             return rj;
         }
-        if(salesOrder.getSalesShippingStatus() != 1){
-            rj.setResultMsg("标记失败，该订单未发货。");
-            return rj;
-        }
-
-        if(type == salesOrder.getSalesDeliver()){
-            if(type == 1){
-                rj.setResultMsg("标记未出库失败，该订单已标记为未出库。");
-                return rj;
-            }else  if(type == 2){
-                rj.setResultMsg("标记出库失败，该订单已标记为已出库。");
-                return rj;
-            }
-        }
-
-        salesOrder.setSalesOldDeliver(salesOrder.getSalesDeliver());
-        salesOrder.setSalesDeliver(type);
-
-        //2020年3月31日新增 如果是上门提货订单，出库时自动标记为已揽件
-        if(type == 2 && salesOrder.getSalesPostFirm().equals("pick")){
-            salesOrder.setOrderCaseDate(new Date());
-        }
-
-        Integer flag = 0;
-        try{
-            flag = salesOrderService.updateDeliver(salesOrder);
-        }catch (Exception e){
-            rj.setResultMsg("标记失败;</br>原因："+e.getMessage());
-            return rj;
-        }
-
-        if(flag < 1){
-            rj.setResultMsg("标记失败，请检查该订单的发货状态及产品库存是否充足。");
-            return rj;
-        }
-        rj = ResponseJson.getSUCCESS();
-        if(1 == type){
-            rj.setResultMsg("标记为未出库状态成功");
-        }else{
-            rj.setResultMsg("出库成功");
-            //如果为子母件则子件也需要出库
-            if(salesOrder.getSalesIsSublist() == 1){
-                List<SalesOrder> orderList = salesOrderService.listSublistCount(salesOrder.getSalesId());
-                if(orderList.size() > 0){
-                    for(SalesOrder order : orderList){
-                        order.setSalesOldDeliver(salesOrder.getSalesDeliver());
-                        order.setSalesDeliver(type);
-                        try{
-                            salesOrderService.updateDeliver(order);
-                        }catch (Exception e){
-                            rj.setResultMsg("子订单标记出库失败;</br>原因："+e.getMessage());
-                            return rj;
-                        }
-                    }
-                }
-            }
-        }
-        return rj;
+        return deliver(request, salesOrder.getSalesPostNum());
     }
 
 

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

@@ -213,7 +213,7 @@
                             <a class="ml-5" style="text-decoration:none;display:inline" href="javascript:void(0);" title="标记出库" onclick="sales_deliver(2,'${(o.salesId)!}');">标记出库</a><br>
                         </#if>
                        <#if o.salesDeliver == 2>
-                            <a class="ml-5" style="text-decoration:none;display:inline" href="javascript:void(0);" title="标记未出库" onclick="sales_deliver(1,'${(o.salesId)!}');">标记未出库</a><br>
+                            <a class="ml-5" style="text-decoration:none;display:none" href="javascript:void(0);" title="标记未出库" onclick="sales_deliver(1,'${(o.salesId)!}');">标记未出库</a><br>
                        </#if>
                     <#else>
                         <a class="ml-5" style="text-decoration:none;display:inline" href="javascript:void(0);" title="标记出库" onclick="sales_deliver(2,'${(o.salesId)!}');">标记出库</a><br>

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

@@ -437,6 +437,12 @@
        if (trs != null && trs.length >= 1) {
            for (var i = 0; i < trs.length; i++) {
                var tr = $(trs[i]);
+               <#--<#if admin??  >
+                  var adminDept = ${(admin.adminDept)!};
+                  if(adminDept == 1){
+                      tr.find(".edit_order_target").show();
+                  }
+               </#if>-->
                var status = tr.attr("status").split(",");
                // 订单状态  0:未发货、1:已打单、3:备货中、4:收货、11:已通知配货
                var orderStatus = status[0];
@@ -490,12 +496,6 @@
                        }
                    }
                }
-               <#if admin??  >
-                  var adminDept = ${admin.adminDept!''};
-                  if(adminDept == 1){
-                      tr.find(".edit_order_target").show();
-                  }
-               </#if>
            }
        }
     });

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

@@ -252,7 +252,7 @@
                                         '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                                         '</div>');
                             } else {
-                                $("#printlist").append('<div style="width: 242px;height: 122px;position: relative;">' +
+                                $("#printlist").append('<div style="width: 242px;height: 126px;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>' +
                                         '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +