Ver código fonte

客户功能修改

yzc 1 ano atrás
pai
commit
263de982b6

+ 5 - 0
hx-customer/src/main/java/com/fjhx/customer/entity/customer/vo/CustomerUserVo.java

@@ -27,4 +27,9 @@ public class CustomerUserVo extends CustomerUser {
      * 客户客体
      */
     private String customerMinorPart;
+
+    /**
+     * 客户编号
+     */
+    private String customerCode;
 }

+ 2 - 1
hx-customer/src/main/resources/mapper/customer/CustomerUserMapper.xml

@@ -27,7 +27,8 @@
                cu.update_time,
                c.`name`     AS customerName,
                c.main_part  AS customerMainPart,
-               c.minor_part AS customerMinorPart
+               c.minor_part AS customerMinorPart,
+               c.customer_code
         FROM customer_user cu
                  LEFT JOIN customer c ON cu.customer_id = c.id
     </sql>

+ 4 - 4
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -3123,10 +3123,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         //修改订单出库状态
         this.update(q -> q
-                .eq(Contract::getId, contractId)
-                .set(Contract::getOutboundStatus, 1)
-                .set(Contract::getOutboundTime, new Date())
-                .set(Contract::getStatus, 75)//已发货
+                        .eq(Contract::getId, contractId)
+//                .set(Contract::getOutboundStatus, 1)
+//                .set(Contract::getOutboundTime, new Date())
+                        .set(Contract::getStatus, 75)//已发货
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
                 .set(BasePo::getUpdateTime, new Date())
         );