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

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

@@ -107,6 +107,7 @@ public class SalesOrder implements Serializable {
 
     private String[] salesIds;              //传入mybatis的订单编号
     private String ids;                     //前台传过来的订单编号
+    private Integer[] storeIds;              //控制可以获得哪些店铺的订单
 
     //Efast升级新增字段 2018-6-6
     private String styleColor;              //上传订单结果颜色
@@ -1134,4 +1135,12 @@ public class SalesOrder implements Serializable {
     public void setSalesWarrantyStatus(Integer salesWarrantyStatus) {
         this.salesWarrantyStatus = salesWarrantyStatus;
     }
+
+    public Integer[] getStoreIds() {
+        return storeIds;
+    }
+
+    public void setStoreIds(Integer[] storeIds) {
+        this.storeIds = storeIds;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/order/OrderDepart.java

@@ -0,0 +1,72 @@
+package com.iamberry.rst.core.order;
+
+import  java.util.Date;
+import  java.io.Serializable;
+
+/**
+ *  订单权限表类
+ * @author Administrator
+ * @Date 2020-03-26
+ */
+public class OrderDepart  implements  Serializable{
+    //id
+    private Integer orderDepartId;
+    //用户id
+    private Integer adminId;
+    //类型 1.销售公司 2.销售店铺
+    private Integer orderDepartType;
+    //销售公司id
+    private Integer companyId;
+    //店铺id
+    private Integer storeId;
+    //创建时间'
+    private Date orderDepartCreateDate;
+
+    public Integer getOrderDepartId(){
+        return orderDepartId;
+    }
+
+    public void setOrderDepartId(Integer  orderDepartId){
+        this.orderDepartId=orderDepartId;
+    }
+
+    public Integer getAdminId(){
+        return adminId;
+    }
+
+    public void setAdminId(Integer  adminId){
+        this.adminId=adminId;
+    }
+
+    public Integer getOrderDepartType(){
+        return orderDepartType;
+    }
+
+    public void setOrderDepartType(Integer  orderDepartType){
+        this.orderDepartType=orderDepartType;
+    }
+
+    public Integer getCompanyId(){
+        return companyId;
+    }
+
+    public void setCompanyId(Integer  companyId){
+        this.companyId=companyId;
+    }
+
+    public Integer getStoreId(){
+        return storeId;
+    }
+
+    public void setStoreId(Integer  storeId){
+        this.storeId=storeId;
+    }
+
+    public Date getOrderDepartCreateDate(){
+        return orderDepartCreateDate;
+    }
+
+    public void setOrderDepartCreateDate(Date  orderDepartCreateDate){
+        this.orderDepartCreateDate=orderDepartCreateDate;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/StoreInfoService.java

@@ -15,6 +15,14 @@ public interface StoreInfoService {
      * @return
      */
     List<StoreInfo> listStore(StoreInfo storeInfo);
+
+    /**
+     * 根据条件查询店铺信息
+     * @param compantIds
+     * @return
+     */
+    List<StoreInfo> getStoreInfoByCompantIds(Integer[] compantIds);
+
     /**
      * 根据条件查询店铺信息
      * @param storeInfo

watero-rst-interface/src/main/java/com/iamberry/rst/faces/order/OrderDepartService.java

@@ -0,0 +1,39 @@
+package com.iamberry.rst.faces.order;
+
+import com.iamberry.rst.core.order.OrderDepart;
+
+import java.util.List;
+
+/**
+ *  订单权限表接口
+ * @author Administrator
+ * @Date 2020-03-26
+ */
+public interface OrderDepartService {
+    /**
+     * 获取集合
+     * @param  orderDepart
+     * @return List
+     */
+    List<OrderDepart> getOrderDepartList(OrderDepart  orderDepart);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  orderDepart
+     */
+    OrderDepart  getOrderDepartById(Integer  id);
+
+    /**
+     * 查询单条数据
+     * @param  adminId
+     * @return  orderDepart
+     */
+    Integer[]  getDepartStoreIds(Integer  adminId);
+
+    /**
+     * 增加数据
+     * @param  orderDepart
+     * @return Integer
+     */
+    Integer  save(OrderDepart  orderDepart);
+}

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -199,11 +200,18 @@ public class InventoryServiceImpl implements InventoryService {
     public synchronized Integer minusInventory(InventoryInfo invent) {
         Integer flag = 0;
         //查询是否是组合产品
-        if(invent != null && invent.getInventoryProductColorId() != null){
-            List<ProductCombinatInfo> listproduct = productMapper.combinatList(productColorMapper.getProductColorById(invent.getInventoryProductColorId()).getColorProductId());
+        if(invent != null ){
+            List<ProductCombinatInfo> listproduct = new ArrayList<>();
+            if(invent.getInventoryProductColorId() != null){
+               listproduct = productMapper.combinatList(productColorMapper.getProductColorById(invent.getInventoryProductColorId()).getColorProductId());
+            }else if(invent.getInventoryProductBar() != null){
+               listproduct = productMapper.combinatList(productColorMapper.getProductColorByBar(invent.getInventoryProductBar()).getColorProductId());
+            }
+
             if(listproduct.size() > 0){
                 for(ProductCombinatInfo info : listproduct){
                     invent.setInventoryProductColorId(info.getCombinatItemColorId());
+                    invent.setInventoryProductBar(info.getColorBar());
                     if(invent.getInventoryGoodProductNum() != null && invent.getInventoryGoodProductNum() != 0 ){
                         invent.setInventoryGoodProductNum(invent.getInventoryGoodProductNum() * info.getCombinatItemNum());
                     }else if(invent.getInventoryDefectiveProductNum() != null && invent.getInventoryDefectiveProductNum() != 0 ){

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

@@ -34,6 +34,11 @@ public class StoreInfoServiceImpl implements StoreInfoService {
     }
 
     @Override
+    public List<StoreInfo> getStoreInfoByCompantIds(Integer[] compantIds) {
+        return storeInfoMapper.getStoreInfoByCompantIds(compantIds);
+    }
+
+    @Override
     public List<StoreInfo> listStoreByDealer(StoreInfo storeInfo) {
         return storeInfoMapper.listStoreByDealer(storeInfo);
     }

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

@@ -14,6 +14,13 @@ public interface StoreInfoMapper {
     Integer addStoreInfo(StoreInfo storeInfo);
 
     /**
+     * 根据条件查询店铺信息
+     * @param compantIds
+     * @return
+     */
+    List<StoreInfo> getStoreInfoByCompantIds(Integer[] compantIds);
+
+    /**
      * 根据id查询店铺信息
      * @param storeId
      * @return

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

@@ -28,6 +28,17 @@
     where si.store_id = #{storeId,jdbcType=INTEGER}
   </select>
 
+  <!-- 根据id查询店铺信息 -->
+  <select id="getStoreInfoByCompantIds" resultType="StoreInfo" parameterType="java.util.ArrayList" >
+    select
+      si.store_id
+    from tb_rst_store_info si
+    where si.company_id in
+    <foreach collection="array" item="compantId" index="index" separator="," open="(" close=")">
+      #{compantId}
+    </foreach>
+  </select>
+
   <!-- 根据efastid查询店铺信息 -->
   <select id="getStoreInfoByEfastId" resultType="StoreInfo" parameterType="java.lang.String" >
     select

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

@@ -0,0 +1,93 @@
+package com.iamberry.rst.service.order;
+
+import com.iamberry.rst.core.cm.StoreInfo;
+import com.iamberry.rst.core.order.OrderDepart;
+import com.iamberry.rst.faces.cm.StoreInfoService;
+import com.iamberry.rst.faces.order.OrderDepartService;
+import com.iamberry.rst.service.order.mapper.OrderDepartMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ *  订单权限表接口
+ * @author Administrator
+ * @Date 2020-03-26
+ */
+@Service
+public class OrderDepartServiceImpl  implements OrderDepartService {
+    @Autowired
+    private OrderDepartMapper orderDepartMapper;
+    @Autowired
+    private StoreInfoService storeInfoService;
+    /**
+     * 获取集合
+     * @param  orderDepart
+     * @return List
+     */
+    @Override
+    public List<OrderDepart> getOrderDepartList(OrderDepart  orderDepart){
+        return  orderDepartMapper.getOrderDepartList(orderDepart);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  orderDepart
+     */
+    @Override
+    public  OrderDepart  getOrderDepartById(Integer  id){
+        return  orderDepartMapper.getOrderDepartById(id);
+    }
+
+    @Override
+    public Integer[] getDepartStoreIds(Integer adminId) {
+        OrderDepart orderDepart = new OrderDepart();
+        orderDepart.setAdminId(adminId);
+        List<OrderDepart> orderDepartList = orderDepartMapper.getOrderDepartList(orderDepart);
+        if(orderDepartList == null || orderDepartList.size() < 1){
+            return new Integer[0];
+        }else{
+            Set<Integer> storeIds = new HashSet<>();
+            Set<Integer> companyIds = new HashSet<>();
+            for (OrderDepart od : orderDepartList) {
+                if(od.getOrderDepartType() == 1){    //类型 1.销售公司 2.销售店铺
+                    companyIds.add(od.getCompanyId());
+                }else{
+                    storeIds.add(od.getStoreId());
+                }
+            }
+            if(companyIds.size() > 0 ){
+                Integer[] compantStoreIds = new Integer[companyIds.size()];
+                Integer i=0;
+                for (Integer companyId : companyIds) {
+                    compantStoreIds[i]  = companyId;
+                    i++;
+                }
+                List<StoreInfo> storeInfoList = storeInfoService.getStoreInfoByCompantIds(compantStoreIds);
+                for (StoreInfo si : storeInfoList) {
+                    storeIds.add(si.getStoreId());
+                }
+            }
+            Integer[] siIds = new Integer[storeIds.size()];
+            Integer y=0;
+            for (Integer siId : storeIds) {
+                siIds[y] = siId;
+                y++;
+            }
+            return siIds;
+        }
+    }
+
+    /**
+     * 增加数据
+     * @param  orderDepart
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(OrderDepart  orderDepart){
+        return  orderDepartMapper.save(orderDepart);
+    }
+}

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

@@ -241,11 +241,12 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         Map<String,Object> paramsMap = new HashMap<>();
         List<Map<String,Object>> conditionTypeList = new ArrayList<>();
 
+        String[] orderIds = {orderId};
+
         //receiverName 收件人姓名 //receiverMobile收件人手机号码 //outOrderId原始订单号 //orderId系统订单号
-        Date endCreateTime = new Date();
         Map<String,Object> orderIdMap = new HashMap<>();
         orderIdMap.put("condType","orderId");
-        orderIdMap.put("condValue",sdf.format(endCreateTime));
+        orderIdMap.put("condValue",orderIds);
         conditionTypeList.add(orderIdMap);
 
         StringBuffer stringBuffer = new StringBuffer();
@@ -277,7 +278,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         OrderSyncLog orderSyncLog = new OrderSyncLog();
         orderSyncLog.setSyncPlatId(orderSyncPlatform.getSyncPlatId());
         orderSyncLog.setSyncLogType(1);
-        orderSyncLog.setSyncPlatId(type);
+        orderSyncLog.setSyncLogMode(type);
         orderSyncLog.setSyncLogRecentNum(amountAllNum); //同步总数量
         orderSyncLog.setSyncLogErrorNum(amountAllNum - amountSuccessAllNum); //同步失败数量
         orderSyncLog.setSyncLogMsg("");   //备注
@@ -372,6 +373,9 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             //循环检测所有订单项是否能够发货
             boolean allStatus = true;
             for (SalesOrderItem salesOrderItem : salesOrder.getSalesOrderItemList()) {
+                if(salesOrderItem.getItemOtherId() == null || "".equals(salesOrderItem.getItemOtherId())){
+                    continue;
+                }
                 Long otherId = Long.valueOf(salesOrderItem.getItemOtherId());   //外部订单id
                 boolean sonStatus = true;
                 Integer itemStatus = 0;
@@ -902,7 +906,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
 
                             salesOrderItem.setItemWarrantyStatus(itemWarrantyStatus);
 
-                            String extSkuId = item.getString("extOuterId"); //69码 外部商家自编码
+                            String extSkuId = item.getString("outerId"); //69码 外部商家自编码
 
                             ProductColor productColor = productColorMapper.getProductColorByBar(extSkuId);
                             if(productColor == null){

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

@@ -0,0 +1,31 @@
+package com.iamberry.rst.service.order.mapper;
+
+import com.iamberry.rst.core.order.OrderDepart;
+
+import java.util.List;
+
+/**
+ *  订单权限表接口
+ * @author Administrator
+ * @Date 2020-03-26
+ */
+public interface OrderDepartMapper {
+    /**
+     * 获取集合
+     * @param  orderDepart
+     * @return List
+     */
+    List<OrderDepart> getOrderDepartList(OrderDepart  orderDepart);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  orderDepart
+     */
+    OrderDepart  getOrderDepartById(Integer  id);
+    /**
+     * 增加数据
+     * @param  orderDepart
+     * @return Integer
+     */
+    Integer  save(OrderDepart  orderDepart);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/orderDepartMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.order.mapper.OrderDepartMapper">
+    <resultMap  id="BaseResultMap" type="OrderDepart" >
+        <result    column="order_depart_id"    property="orderDepartId" />
+        <result    column="admin_id"    property="adminId" />
+        <result    column="order_depart_type"    property="orderDepartType" />
+        <result    column="company_id"    property="companyId" />
+        <result    column="store_id"    property="storeId" />
+        <result    column="order_depart_create_date"    property="orderDepartCreateDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.order_depart_id,
+        t.admin_id,
+        t.order_depart_type,
+        t.company_id,
+        t.store_id,
+        t.order_depart_create_date
+    </sql>
+    <select id="getOrderDepartList" resultMap="BaseResultMap" parameterType="OrderDepart" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_order_depart t
+        <where>
+            <if test="orderDepartId != null ">
+                AND t.order_depart_id = #{orderDepartId}
+            </if >
+            <if test="adminId != null ">
+                AND t.admin_id = #{adminId}
+            </if >
+            <if test="orderDepartType != null ">
+                AND t.order_depart_type = #{orderDepartType}
+            </if >
+            <if test="companyId != null ">
+                AND t.company_id = #{companyId}
+            </if >
+            <if test="storeId != null ">
+                AND t.store_id = #{storeId}
+            </if >
+        </where>
+    </select>
+
+    <select id="getOrderDepartById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_order_depart t
+        where t.order_depart_id= #{orderDepartId}
+    </select>
+
+    <insert id="save" parameterType="OrderDepart" >
+        insert into
+        tb_rst_order_depart
+        (
+        admin_id,
+        order_depart_type,
+        company_id,
+        store_id
+        )
+        values
+        (
+        #{adminId},
+        #{orderDepartType},
+        #{companyId},
+        #{storeId}
+        )
+    </insert>
+</mapper>

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

@@ -38,6 +38,14 @@ public class AdminOrderPlatformController {
     }
 
     @ResponseBody
+    @RequestMapping("/pullOrder")
+    public ResponseJson pullOrder(HttpServletRequest request,String orderId){
+        Calendar calendar = Calendar.getInstance();
+        orderSyncLogService.syncXYTOrderOne(2,orderId);
+        return  new ResponseJson();
+    }
+
+    @ResponseBody
     @RequestMapping("/send")
     public ResponseJson sendOrder(HttpServletRequest request,Integer orderId){
         boolean flag = orderSyncLogService.syncXYTOrderShipInspec(orderId);

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

@@ -19,10 +19,7 @@ import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.dm.DealerChannelService;
 import com.iamberry.rst.faces.dm.DealerProductService;
 import com.iamberry.rst.faces.dm.SupplierProductService;
-import com.iamberry.rst.faces.order.EfastOrderService;
-import com.iamberry.rst.faces.order.LogisticsInfoService;
-import com.iamberry.rst.faces.order.OrderBatchService;
-import com.iamberry.rst.faces.order.OrderWarehouseService;
+import com.iamberry.rst.faces.order.*;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.util.GenerateKeyUtil;
@@ -91,6 +88,8 @@ public class AdminSalesOrderController {
     private DealerProductService dealerProductService;
     @Autowired
     private SupplierProductService supplierProductService;
+    @Autowired
+    private OrderDepartService orderDepartService;
     /**
      * 分页查询订单列表信息
      * @param request
@@ -107,18 +106,6 @@ public class AdminSalesOrderController {
                                         @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
                                         @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                         @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
-        // 开始装配查询订单的数据
-        if(AdminUtils.getLoginAdmin().getAdminDept() == 2){
-            // 如果是销售部门，只允许查看自己的订单
-            salesOrder.setSalesAdminId(AdminUtils.getLoginAdmin().getAdminId());
-        }
-        // 不查询客诉添加的订单
-        salesOrder.setIsSelectCustomer(2);
-        //分页获取订单信息
-        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
-        if (totalNum != 0) {
-            pagedResult.setTotal(totalNum);
-        }
         // 查询条件的店铺信息
         StoreInfo storeInfo = new StoreInfo();
         // 查询条件的产品信息
@@ -133,6 +120,55 @@ public class AdminSalesOrderController {
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
         // 查询产品颜色
         List<ProductColor> productColorList = productService.listproductAndColor(productColor);
+
+        //判断用户只能查看自己所能查询的公司的订单
+//        Integer[] storeIds = orderDepartService.getDepartStoreIds(AdminUtils.getLoginAdminId());
+//        if(storeIds.length < 1){
+//            // 不查询客诉添加的订单
+//            salesOrder.setIsSelectCustomer(2);
+//            //分页获取订单信息
+//            PagedResult<SalesOrder> pagedResult = PageUtil.getPage(new ArrayList<SalesOrder>());
+//            pagedResult.setTotal(0);
+//            pagedResult.setPageNo(1);
+//            pagedResult.setPages(0);
+//            pagedResult.setPageSize(20);
+//
+//            if (totalNum != 0) {
+//                pagedResult.setTotal(totalNum);
+//            }
+//            ModelAndView mv = new ModelAndView("order/salesOrder/sales_order_list");
+//            StitchAttrUtil.getSa()
+//                    .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
+//                    .addNoPro("suSalesOrderItemList")
+//                    .addNoPro("salesOrderItemList")
+//                    .setModelAndView(salesOrder, mv, "/admin/salesOrder/list_order_page", pagedResult);
+//            salesOrder.setSalesOrderItemList(null);
+//
+//            // 查询订单各个状态数量
+//            mv.addObject("orderNum",salesOrderService.getStatusNum());
+//            mv.addObject("listStoreInfo",listStoreInfo);
+//            mv.addObject("logisticsInfoList",logisticsInfoList);
+//            mv.addObject("identity",AdminUtils.getLoginAdmin().getAdminDept());
+//            mv.addObject("productColorList",productColorList);
+//            mv.addObject("admin",AdminUtils.getLoginAdmin());
+//            return mv;
+//        }else{
+//            salesOrder.setStoreIds(storeIds);
+//        }
+
+        // 开始装配查询订单的数据
+        if(AdminUtils.getLoginAdmin().getAdminDept() == 2){
+            // 如果是销售部门，只允许查看自己的订单
+            salesOrder.setSalesAdminId(AdminUtils.getLoginAdmin().getAdminId());
+        }
+
+        // 不查询客诉添加的订单
+        salesOrder.setIsSelectCustomer(2);
+        //分页获取订单信息
+        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
+        if (totalNum != 0) {
+            pagedResult.setTotal(totalNum);
+        }
         ModelAndView mv = new ModelAndView("order/salesOrder/sales_order_list");
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -43,6 +43,7 @@
 		<typeAlias type="com.iamberry.rst.core.order.OrderWarehouseAdmin" alias="OrderWarehouseAdmin"/>
 		<typeAlias type="com.iamberry.rst.core.order.ProductAreaRela" alias="ProductAreaRela"/>
 		<typeAlias type="com.iamberry.rst.core.order.ProductArea" alias="ProductArea"/>
+		<typeAlias type="com.iamberry.rst.core.order.OrderDepart" alias="OrderDepart"/>
 
 		<typeAlias type="com.iamberry.rst.core.sms.SmsMessage" alias="SmsMessage"/>
 		<typeAlias type="com.iamberry.rst.core.sms.OrderMessage" alias="OrderMessage"/>
@@ -324,6 +325,7 @@
 		<mapper resource="com/iamberry/rst/service/order/mapper/logisticsInfoMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/order/mapper/provincesLogisticsMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/order/mapper/orderWarehouseMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/order/mapper/orderDepartMapper.xml"/>
 		<!--订单拉取平台-->
 		<mapper resource="com/iamberry/rst/service/order/mapper/orderSyncLogMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/order/mapper/orderSyncPlatformMapper.xml"/>

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

@@ -48,6 +48,8 @@
         .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
         .txt-red{color:red}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .up_class{font-weight: bold;}
+        .down_class{font-weight: bold;}
     </style>
     <title>拆分订单</title>
 </head>
@@ -465,7 +467,7 @@
     var tr_node_msg;    //添加/修改订单项，tr的节点
     var $updateNode; //修改的tr元素
 
-    //删除节点-保存对应删除的节点信息-主要对应的是外部订单项id与颜色的对应
+    //删除节点-保存对应删除的节点信息
     var deleteArray = new Array();
 
     $(function(){
@@ -752,10 +754,20 @@
                             for(var i=0;i<data.returnMsg.productColorList.length;i++){
                                 order_item_key ++;
                                 var productColor = data.returnMsg.productColorList[i];
+
+                                var newItemOtherId = "";
+                                //如果是删除了新加的，应该将以前的小亚通的id赋值上去
+                                for(var i=0;i<deleteArray.length;i++){
+                                    var obj = deleteArray[i];
+                                    if(obj.itemColorBar == productColor.colorBar){
+                                        newItemOtherId = obj.itemotherid;
+                                    }
+                                }
+
                                 var colorDiscount = accDiv(productColor.colorDiscount,100);
                                 var html = "";
                                 html +=  '<tr class="text-c '+ tr_node_msg +'">'
-                                        +   '<td msg="'+ tr_node_msg +'" key="'+ order_item_key +'" itemOtherId="" color="'+ productColor.colorId +'">'+ tr_node_msg +'</td>'
+                                        +   '<td msg="'+ tr_node_msg +'" key="'+ order_item_key +'" itemOtherId="'+ newItemOtherId +'" color="'+ productColor.colorId +'">'+ tr_node_msg +'</td>'
                                         +   '<td>'+ cufte(productColor.productName) +'</td>'
                                         +   '<td>'+ cufte(productColor.colorName) +'</td>'
                                         +   '<td class="itemColorBar">'+ cufte(productColor.colorBar) +'</td>'
@@ -865,6 +877,8 @@
     function deleteOrderItem(thisNode) {
 
         var code = $(thisNode).parent().parent().find("td").eq(0).attr("msg");
+        var itemotherid = $(thisNode).parent().parent().find("td").eq(0).attr("itemotherid");
+        var itemColorBar = $(thisNode).parent().parent().find(".itemColorBar").text();
         var siblings = $(thisNode).parent().parent().siblings("."+code);
 
         if(main_code == code){
@@ -875,6 +889,11 @@
             }
         }
 
+        var obj = new Object();
+        obj.itemotherid = itemotherid;
+        obj.itemColorBar = itemColorBar;
+        deleteArray.push(obj);
+
         $(thisNode).parent().parent().remove();
         
         //合并单元格