Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java

@@ -198,14 +198,14 @@ public class IoChangeInoutService {
                 outOrder.setFromInvCode(null);
                 outOrder.setFromDeptCode(null);
             } else if (bussinessChangeTypeEntity.getCreateType() == 3) {    //寄售、预验收补单
-                outOrder.setCustomerId(null);
+                outOrder.setCustomerId(corpName);
-                outOrder.setFromCorp(null);
+                outOrder.setFromCorp(corpName);
                 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_IN_CODE);
                 outOrder.setFromInvCode(invWarehouseEntity.getCode());
                 outOrder.setFromDeptCode(invWarehouseEntity.getParentId());
             } else if (bussinessChangeTypeEntity.getCreateType() == 4) {
-                outOrder.setCustomerId(null);
+                outOrder.setCustomerId(corpName);
-                outOrder.setFromCorp(null);
+                outOrder.setFromCorp(corpName);
                 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_CODE);
                 outOrder.setFromInvCode(invWarehouseEntity.getCode());
                 outOrder.setFromDeptCode(invWarehouseEntity.getParentId());

src/main/resources/schemas/schema_v2.1.sql

@@ -356,3 +356,4 @@ ALTER TABLE `auth_dept_user`
     ADD UNIQUE (`userId`, deptId);
 
 
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);