订单 编辑 反写客户资料

src/main/java/com/dk/mdm/mapper/mst/CustomerMapper.xml

@@ -313,15 +313,15 @@
         tma.receivable,
         tma.receivable_residue,
         tma.receipt_residue,
-        tmor.sum_amt_receivable AS "startAmount",
-        concat(tms3.staff_name)  AS "followStaffsName"
+        tmor.sum_amt_receivable AS "startAmount"
+--         concat(tms3.staff_name)  AS "followStaffsName"
         FROM dkic_b.t_mst_customer tmc
         LEFT JOIN dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tmc.cus_from
         LEFT JOIN dkic_b.t_mst_sale_channel tmsc on tmsc.channel_id = tmc.channel_id
         LEFT JOIN dkic_b.t_mst_org tmo on tmo.org_id = tmc.org_id
         LEFT JOIN dkic_b.t_mst_staff tms on tms.staff_id = tmc.staff_id
         LEFT JOIN dkic_b.t_mst_staff tms2 on tms2.staff_id = tmc.report_staff
-        LEFT JOIN dkic_b.t_mst_staff tms3 on tms3.staff_id = Any(tmc.follow_staffs)
+--         LEFT JOIN dkic_b.t_mst_staff tms3 on tms3.staff_id = Any(tmc.follow_staffs)
         LEFT JOIN sys.t_data_kind tdk on tdk.kind_code = tmc.sale_status
         LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id =  tmc.cus_id
         LEFT JOIN dkic_b.t_mac_other_receivable tmor on tmor.object_id = tmc.cus_id and tmor.business_type = 0

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -232,6 +232,8 @@
         ,t.sub_unit_id
         ,ul.unit_name as "unitName"
         ,u2.unit_name as "subUnitName"
+        ,t.cost_price
+        ,t.cost_amt
         FROM dkic_b.t_psi_order_item as t
         LEFT join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
                  LEFT JOIN dkic_b.t_mst_unit AS ul ON tmgs.unit_id = ul.unit_id

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -57,6 +57,7 @@ import com.dk.mdm.model.response.sale.OrderItemResponse;
 import com.dk.mdm.model.response.sale.OrderResponse;
 import com.dk.mdm.model.vo.ivt.OutboundVO;
 import com.dk.mdm.model.vo.mac.RecPayItemVO;
+import com.dk.mdm.model.vo.mst.CustomerVO;
 import com.dk.mdm.model.vo.mst.SupplierVo;
 import com.dk.mdm.model.vo.sale.OrderItemVO;
 import com.dk.mdm.model.vo.sale.OrderVO;
@@ -65,6 +66,7 @@ import com.dk.mdm.service.ivt.outbound.OutboundSaleOrderService;
 import com.dk.mdm.service.mac.AccountService;
 import com.dk.mdm.service.mac.RecPayItemService;
 import com.dk.mdm.service.mac.ReceiptService;
+import com.dk.mdm.service.mst.CustomerService;
 import com.dk.mdm.service.mst.MoneyAccountService;
 import com.dk.mdm.service.mst.SupplierService;
 import org.springframework.stereotype.Service;
@@ -169,6 +171,9 @@ public class OrderService extends BaseService<Order> {
     @Autowired
     private AuthUtils authUtils;
 
+    @Autowired
+    private CustomerService customerService;
+
     /**
      * @desc : 条件查询
      * @author : 付斌
@@ -553,6 +558,13 @@ public class OrderService extends BaseService<Order> {
             gradeCode = listCompany.get(0).get("gradeCode").toString();
         }
 
+        //更新总单客户信息
+        customerService.update(new CustomerVO().setCusId(orderVO.getCusId()).setCusCode(orderVO.getCusCode())
+                .setCusName(orderVO.getCusName()).setCusPhone(orderVO.getCusPhone()).setAddressArea(orderVO.getAddressArea())
+                .setAddressFull(orderVO.getAddressFull()).setAddressName(orderVO.getAddressName())
+                .setAddressNo(orderVO.getAddressNo()).setAddressGcj02(orderVO.getAddressGcj02())
+                .setContactName(orderVO.getContactName()).setContactPhone(orderVO.getContactPhone()).setChannelId(orderVO.getSalesChannel()));
+
         // 明细实体（避免并发，需要再查一遍）
         OrderItem orderItemForUpdate;
         // 转化实体