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

api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java

@@ -12,6 +12,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 @ServletComponentScan
 public class ApiAdminApplication extends SpringBootServletInitializer {
 
+
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(ApiAdminApplication.class);
         application.addInitializers(new ToolApplicationContextInitializer());

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java

@@ -119,9 +119,20 @@ public class BussinessTypeController {
             bussinessTypeFilterRequest.setAdvanceType(bussinessLocalTypeEntity.isAdvanceType());
         }
 
+        //查询该仓库绑定的单据
+       List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntityList=warehouseBussinessTypeService.getListByCode(bussinessTypeFilterRequest.getCode());
 
         List<BussinessTypResponse> bussinessTypeEntities;
         bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
+        for (BussinessTypResponse w1:bussinessTypeEntities){
+            for (WarehouseBussinessTypeEntity w2:warehouseBussinessTypeEntityList){
+                if(w1.getAction().equals(w2.getAction())){
+                    w1.setCheckSelect(true);
+                    break;
+                }
+            }
+        }
+
         PageInfo<BussinessTypResponse> pageInfo;
         pageInfo = new PageInfo<>(bussinessTypeEntities);
         PageSimpleResponse<BussinessTypResponse> pageSimpleResponse = new PageSimpleResponse<>();

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java

@@ -247,7 +247,7 @@ public class UdiRelevanceController {
                         for (int i = 0; i < udiInfoEntities.size(); i++) {
                             List<WarehouseEntity> warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode());
                             if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
-                                return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
+                                return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
                             }
                         }
                     }
@@ -257,7 +257,7 @@ public class UdiRelevanceController {
                 if (StrUtil.isNotEmpty(ids)) {
                     List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
                     if (CollUtil.isNotEmpty(warehouseEntityList)) {
-                        return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
+                        return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
                     }
                 }
             }
@@ -265,7 +265,7 @@ public class UdiRelevanceController {
 
         CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(ids, null);
         if (companyProductRelevanceEntity != null) {
-            return ResultVOUtils.error(500, "改产品已被供应商选入" + "不能删除!");
+            return ResultVOUtils.error(500, "该产品已被已被供应商选入" + "不能删除!");
         }
 
 

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

@@ -640,11 +640,11 @@ public class OrderDetailController {
                     return ResultVOUtils.error(500, "所选单据类型不一致！");
                 }
 
-                if (orderEntity.getInvStorageCode().equals(erpOrderEntities.get(i).getLocStorageCode())) {
+                if (!orderEntity.getInvStorageCode().equals(erpOrderEntities.get(i).getLocStorageCode())) {
                     return ResultVOUtils.error(500, "扫码单据与业务单据当前仓库不一致！");
                 }
 
-                if (orderEntity.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
+                if (!orderEntity.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
                     return ResultVOUtils.error(500, "扫码单据与业务单据当前分库不一致！");
                 }
 

api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java

@@ -36,8 +36,8 @@ public class BasicUnitMaintainEntity {
     private String thirdName4;
 
     private Date updateTime;
-    private int corpType;
+    private Integer corpType;
 
-    private int outType;
+    private Integer outType;
 
 }

api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java

@@ -27,5 +27,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private String locInvCode;
     private String locSubInvCode;
     private String lastUpdateTime;
+    private String code;
 
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java

@@ -74,4 +74,6 @@ public class BussinessTypResponse {
     private boolean supplementAll;      //是否全量补单
     private boolean checkCopy;
     private boolean secCheckCopy;
+
+    private boolean checkSelect; //判断多选框是否勾选
 }

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

@@ -109,7 +109,8 @@ public class HeartService {
         SpsSyncBusResponse spsSyncBusResponse = upBasicService.upAllBus(spsSyncDataRequest);
         if (CollUtil.isEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities())
                 && CollUtil.isEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities())
-                && CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities())) {
+                && CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities())
+                && CollUtil.isEmpty(spsSyncBusResponse.getEntrustReceEntities())) {
             return ResultVOUtils.success("无数据");
         }
         BasicExportStatusEntity basicExportStatusEntity2 = basicExportService.findByData(ConstantStatus.SYNC_BUS_TYPE, 0);

api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java

@@ -316,8 +316,8 @@ public class UpBasicService {
             BeanUtils.copyProperties(spsSyncDataRequest, basicEntrustRecRequest);
             List<EntrustReceEntity> dlEntrustReceEntities = entrustReceService.filterEntrustRec(basicEntrustRecRequest);
             if (CollUtil.isNotEmpty(dlEntrustReceEntities)) {
-                List<EntrustReceEntity> temps = entrustReceService.filterEntrustRec(new BasicEntrustRecRequest());
-                spsSyncBusResponse.setEntrustReceEntities(temps);
+//                List<EntrustReceEntity> temps = entrustReceService.filterEntrustRec(new BasicEntrustRecRequest());
+                spsSyncBusResponse.setEntrustReceEntities(dlEntrustReceEntities);
             }
         }
 

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -294,6 +294,7 @@
             <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
             <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
             <if test="cpms != null">cpms=#{cpms},</if>
+            <if test="sptm != null">sptm=#{sptm},</if>
             <if test="measname != null">measname=#{measname},</if>
             <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
             <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>