Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -126,15 +126,14 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Transactional
     @Override
     public Integer updateOrderInfo(SalesOrder salesOrder) {
-        int flag = 0;
         //删除订单项
-        flag = salesOrderMapper.delOrderItem(salesOrder.getSalesId());
+        int flag = salesOrderMapper.delOrderItem(salesOrder.getSalesId());
         if (flag <= 0) {
             throw new RuntimeException("删除订单项失败！");
         }
 
         //修改订单
-        salesOrderMapper.updateSalesOrder(salesOrder);
+        flag = salesOrderMapper.updateSalesOrder(salesOrder);
         if (flag <= 0) {
             throw new RuntimeException("修改订单失败！");
         }
@@ -144,6 +143,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         if (flag <= 0) {
             throw new RuntimeException("增加订单项失败！");
         }
+        // 更新Redis缓存
+        Map<String,String> map = System.getenv();
+        String name = map.get("COMPUTERNAME");
+        if ("iZ94klno8qrZ".equalsIgnoreCase(name)) {
+            name = "RST_";
+        } else {
+            name = "adv_";
+        }
+        RedisUtils.del(name + "ORDER_ITEM_" + salesOrder.getSalesId());
         return flag;
     }
 
@@ -278,6 +286,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrder;
     }
 
+    @Override
     public void parseOrder(SalesOrder oginerOrder, List<SalesOrder> listOrder) {
         // 订单项拆分完成，直接返回
         if (oginerOrder.getSalesOrderItemList().size() <= 0) {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -483,8 +483,6 @@
 <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs_v_5_0.js"></script>
 <script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
 <script type="text/javascript">
-    var LODOP=getLodop();
-
     function to_detectState(state) {
         window.location.href= "${path}/admin/detect/select_detect_list?state="+state;
     }