Merge remote-tracking branch 'origin/busUser' into zhairh

# Conflicts:
#	api-admin/src/main/resources/application-dev.properties

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java

@@ -327,7 +327,11 @@ public class StockOrderDetailController {
                 stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory());
                 stockOrderDetailEntity.setMeasname(udiInfoEntity.getMeasname());
                 stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
-                stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
+                if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh()))
+                    stockOrderDetailEntity.setZczbhhzbapzbh(stockOrderIdsRequest.getZczbhhzbapzbh());
+                else
+                    stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
+
                 if (StrUtil.isNotEmpty(udiInfoEntity.getPrice())) {
                     stockOrderDetailEntity.setPrice(new BigDecimal(udiInfoEntity.getPrice()));
                 }

api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java

@@ -400,7 +400,7 @@ public class OrderController {
 
                 if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
 
-                    if (StrUtil.isEmpty(entrustReceEntity.getAction())) {
+                    if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
                         transferOrder(orderEntity, entrustReceEntity);
                     }
 

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java

@@ -53,4 +53,6 @@ public class StockOrderEntity {
     private String dept;
     private String deptName;
 
+    private String reviewUserName;
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java

@@ -75,4 +75,8 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String thrRegisterNo;
     private String thrManufactory;
 
+    private String auditTime;
+    private String reviewUserName;
+
+
 }

api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml

@@ -107,7 +107,8 @@
     <select id="filterListOr" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
             resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
         SELECT stock_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bustype_local.name
-        billTypeName,iws2.name fromSubInvName,auth_dept.name deptName FROM stock_order
+        billTypeName,iws2.name fromSubInvName,auth_dept.name deptName,auth_user.employeeName reviewUserName FROM
+        stock_order
         left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON stock_order.locStorageCode = inv_warehouse.`code`
@@ -115,6 +116,7 @@
         LEFT JOIN inv_warehouse_sub iws2 ON stock_order.fromSubInvCode = iws2.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         left join auth_dept on stock_order.dept =auth_dept.code
+        left join auth_user on stock_order.reviewUser = auth_user.id
         <where>
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}