业务单据：功能，界面修改优化

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java

@@ -298,6 +298,7 @@ public class RegisterController {
             userRegisterEntity.setId(registerCheckRequest.getId());
             userRegisterEntity.setCompanyId(registerCheckRequest.getCompanyId());
             userRegisterEntity.setCompanyName(registerCheckRequest.getCompanyName());
+            userId = Long.parseLong(registerCheckRequest.getCompanyId());
             userRegisterService.updateUserRegister(userRegisterEntity);
         }
         UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId());

api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.info;
 
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest;
@@ -13,6 +14,7 @@ import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
+import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.thread.CompanyProductsRelService;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -38,7 +40,8 @@ public class CompanyProductRelevanceController {
     private CompanyProductRelevanceService companyProductRelevanceService;
     @Resource
     private CompanyProductsRelService companyProductsRelService;
-
+    @Resource
+    CompanyService companyService;
 
     @GetMapping("/sale/info/company/product/relevance/filter")
     public BaseResponse filterCompanyProductRelevance(CompanyProductRelevanceRequest companyProductRelevanceRequest,
@@ -92,6 +95,13 @@ public class CompanyProductRelevanceController {
         if (companyProductRelevanceService.findCompanyProductRelevanceByProductUuid(companyProductRelevanceEntity) != null) {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
         }
+        CompanyEntity companyEntity = companyService.findCompany(companyProductRelevanceEntity.getCustomerId());
+        if (companyEntity.getUnitIdFk().equals("110")) {
+            companyProductRelevanceEntity.setUnitFk(null);
+        } else {
+            companyProductRelevanceEntity.setCustomerId(null);
+            companyProductRelevanceEntity.setUnitFk(companyEntity.getUnitIdFk());
+        }
         companyProductRelevanceEntity.setCreate_time(new Date());
         companyProductRelevanceEntity.setUpdate_time(new Date());
         companyProductRelevanceEntity.setAuditStatus("3");
@@ -102,7 +112,13 @@ public class CompanyProductRelevanceController {
 
     @PostMapping("/sale/info/insertFilter")
     public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
-
+        CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId());
+        if (companyEntity.getUnitIdFk().equals("110")) {
+            udiInfoExportRequest.setUnitFk(null);
+        } else {
+//            udiInfoExportRequest.setCustomerId(null);
+            udiInfoExportRequest.setUnitFk(companyEntity.getUnitIdFk());
+        }
         companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
         return ResultVOUtils.success("后台正在导入，请稍后刷新查看！");
     }

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

@@ -7,11 +7,15 @@ import com.glxp.sale.admin.constant.Constant;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
 import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
+import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.inout.*;
 import com.glxp.sale.admin.entity.udid.UdiEntity;
 import com.glxp.sale.admin.req.inout.*;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.service.basic.BussinessTypeService;
+import com.glxp.sale.admin.service.basic.UdiInfoService;
+import com.glxp.sale.admin.service.basic.UdiRelevanceService;
+import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.service.inout.*;
 import com.glxp.sale.admin.thread.InvProductsTrService;
 import com.glxp.sale.admin.thread.IoTransInoutService;
@@ -54,7 +58,8 @@ public class OrderController {
     InvProductsTrService invProductsTrService;
     @Resource
     BussinessTypeService bussinessTypeService;
-
+    @Resource
+    CompanyService companyService;
     @Value("${file_path}")
     private String filePath;
 
@@ -84,6 +89,16 @@ public class OrderController {
             return ResultVOUtils.success();
         if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID))
             orderFilterRequest.setCustomerId(null);
+        else {
+            CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId()));
+            if (companyEntity.getUnitIdFk().equals("110")) {
+                orderFilterRequest.setFromCorpId(null);
+            } else {
+                orderFilterRequest.setCustomerId(null);
+                orderFilterRequest.setFromCorpId(companyEntity.getUnitIdFk());
+            }
+        }
+
 //        List<OrderEntity> orderEntityList = orderService.filterListOr(orderFilterRequest);
         List<OrderEntity> orderEntityList = orderService.filterList(orderFilterRequest);
         PageInfo<OrderEntity> pageInfo;
@@ -145,6 +160,17 @@ public class OrderController {
         if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success();
         if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID))
             orderFilterRequest.setCustomerId(null);
+        else {
+
+            CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId()));
+            if (companyEntity.getUnitIdFk().equals("110")) {
+                orderFilterRequest.setFromCorpId(null);
+            } else {
+                orderFilterRequest.setCustomerId(null);
+                orderFilterRequest.setFromCorpId(companyEntity.getUnitIdFk());
+            }
+
+        }
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }

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

@@ -472,7 +472,7 @@ public class OrderDetailController {
             List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId());
             transInoutService.genOrderDetail(warehouseEntityList);
             checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
-
+//            transInoutService.printOrder(orderEntity.getId());
 //            List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId());
 //            orderDetailService.insertErpOrders(returnOrders);
 //            List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId());
@@ -517,6 +517,7 @@ public class OrderDetailController {
             if (erpIds != null && erpIds.size() > 0) { //已经绑定ERPID，则自动校验
                 List<ErpOrderEntity> erpOrderEntities = thrDataService.getStockOrders(erpIds);
                 checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
+//                ioTransInoutService.printOrder(orderEntity.getId());
             } else {
                 //未绑定Id,则更改状态，等待校验
                 orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);

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

@@ -5,6 +5,7 @@ import com.glxp.sale.admin.constant.Constant;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.controller.inout.inventory.InvPrintController;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.entity.basic.*;
 import com.glxp.sale.admin.entity.basic.StockPrintEntity;
 import com.glxp.sale.admin.entity.basic.StockPrinttREntity;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
@@ -20,6 +21,8 @@ import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.res.inout.ErpOrderResponse;
 import com.glxp.sale.admin.res.inout.StockOrderResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
+import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
+import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyService;
@@ -27,6 +30,7 @@ import com.glxp.sale.admin.service.inout.*;
 import com.glxp.sale.admin.service.inventory.InCodeLogService;
 import com.glxp.sale.admin.service.inventory.InvStockPrintService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
+import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.admin.util.DateUtil;
 import com.glxp.sale.admin.util.StockOrderBillNoUtils;
 import com.glxp.sale.common.enums.ResultEnum;
@@ -71,14 +75,14 @@ public class StockOrderController {
     @Resource
     private AuthAdminService authAdminService;
     @Resource
-    private InvPrintController invPrintController;
-    @Resource
     InvStockPrintService stockPrintService;
     @Resource
-    InCodeLogService inCodeLogService;
-    @Resource
     CompanyService companyService;
     @Resource
+    BussinessLocalTypeService bussinessLocalTypeService;
+    @Resource
+    BasicUnitMaintainService basicUnitMaintainService;
+    @Resource
     OrderService orderService;
 
     @GetMapping("/udiwms/stock/order/error")
@@ -172,7 +176,18 @@ public class StockOrderController {
                 stockOrderEntity.setCorpName(companyEntity.getCompanyName());
                 stockOrderEntity.setUnitIdFk(companyEntity.getUnitIdFk());
             } else {
-
+                if (stockOrderPostRequest.getCorpId() == null) {
+                    BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(stockOrderPostRequest.getCorpName());
+                    BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
+                    if (basicUnitMaintainEntity == null && bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
+                        basicUnitMaintainEntity = new BasicUnitMaintainEntity();
+                        basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
+                        stockOrderPostRequest.setCorpId(basicUnitMaintainEntity.getErpId());
+                        basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
+                        basicUnitMaintainEntity.setName(stockOrderPostRequest.getCorpName());
+                        basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
+                    }
+                }
                 stockOrderEntity.setCorpId(stockOrderPostRequest.getCorpId());
                 stockOrderEntity.setCorpName(stockOrderPostRequest.getCorpName());
                 stockOrderEntity.setUnitIdFk(stockOrderPostRequest.getUnitIdFk());
@@ -284,10 +299,15 @@ public class StockOrderController {
         List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
         String customerId = getCustomerId();
         if (customerId != null) {
+            if (customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
+                stockOrderFilterRequest.setUnitIdFk(null);
+            } else {
                 CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId));
                 stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
             }
 
+        }
+
         List<StockOrderEntity> stockOrderEntityList;
         stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
         if (stockOrderEntityList != null && stockOrderEntityList.size() > 0) {

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

@@ -7,6 +7,9 @@ import com.glxp.sale.admin.constant.Constant;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
+import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
+import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
 import com.glxp.sale.admin.entity.inout.OrderEntity;
@@ -27,6 +30,8 @@ import com.glxp.sale.admin.res.inout.PurchaseinResponse;
 import com.glxp.sale.admin.res.inout.StockOrderDetailQueryProductResponse;
 import com.glxp.sale.admin.res.inout.StockOrderDetailResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
+import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
+import com.glxp.sale.admin.service.basic.BussinessTypeService;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
@@ -75,6 +80,10 @@ public class StockOrderDetailController {
     private SystemParamConfigService systemParamConfigService;
     @Resource
     AuthAdminService authAdminService;
+    @Resource
+    BussinessTypeService bussinessTypeService;
+    @Resource
+    BussinessLocalTypeService bussinessLocalTypeService;
 
     @GetMapping("/udiwms/stock/order/detail/filter")
     public BaseResponse filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@@ -240,15 +249,15 @@ public class StockOrderDetailController {
 
         List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
         List<StockOrderDetailEntity> originDatas = stockOrderIdsRequest.getStockOrderLists();
-        for (String id : stockOrderIdsRequest.getIds()) {
+        for (StockSelectDataEntity stockSelectDataEntity : stockOrderIdsRequest.getDatas()) {
             CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
-            companyProductRelevanceRequest.setId(id);
+            companyProductRelevanceRequest.setId(stockSelectDataEntity.getRelId());
             companyProductRelevanceRequest.setDiType(1);
             companyProductRelevanceRequest.setCustomerId(getCustomerId());
             List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = new ArrayList<>();
             if (companyProductRelevanceRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
                 FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-                filterUdiInfoRequest.setId(id);
+                filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId());
                 filterUdiInfoRequest.setDiType(1);
                 List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
                 if (udiRelevanceResponses.size() > 0) {
@@ -267,6 +276,9 @@ public class StockOrderDetailController {
                 stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
                 stockOrderDetailEntity.setCount(0 + "");
                 stockOrderDetailEntity.setReCount(0 + "");
+                stockOrderDetailEntity.setBatchNo(stockSelectDataEntity.getBatchNo());
+                stockOrderDetailEntity.setProductDate(stockSelectDataEntity.getProductDate());
+                stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate());
                 stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
                 stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
                 if (stockOrderIdsRequest.getUdiEntity() != null) {
@@ -395,10 +407,9 @@ public class StockOrderDetailController {
     @GetMapping("/udiwms/stock/order/detail/filterProduct")
     public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
 
-        String nameCode = null;
 
+        String nameCode = null;
         UdiEntity udiEntity = null;
-
         if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
             udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
             if (udiEntity != null) {
@@ -413,32 +424,22 @@ public class StockOrderDetailController {
                 filterUdiInfoRequest.setNameCode(null);
             }
         }
-
         filterUdiInfoRequest.setDiType(1);
         CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
         BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
         List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
         if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
-            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
-            basicInstrumentMaintainRelevanceResponses = new ArrayList<>();
+            if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
-            for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
+                companyProductRelevanceRequest.setCustomerId(null);
-                CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
+                companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
-                BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
+                basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
-                companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
+            } else {
-                basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
+                basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
             }
-        } else
+        } else {
             basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
-
+        }
-        //todo 为什么要把去掉使用单元
-//        if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
-//            for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) {
-//                if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) {
-//                    basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm());
-//                }
-//            }
-//        }
-
         PageInfo<CompanyProductRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
         PageSimpleResponse<CompanyProductRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -447,6 +448,18 @@ public class StockOrderDetailController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    public List<CompanyProductRelevanceResponse> getHosDatas(FilterUdiInfoRequest filterUdiInfoRequest) {
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+        List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = new ArrayList<>();
+        for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
+            CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
+            BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
+            companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
+            basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
+        }
+        return basicInstrumentMaintainRelevanceResponses;
+    }
+
     @GetMapping("/udiwms/stock/order/detail/copy")
     public BaseResponse uploadCount(@RequestParam("id") String id) {
         if (StringUtils.isNotBlank(id)) {

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

@@ -6,6 +6,8 @@ import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
 import com.glxp.sale.admin.controller.inout.utils.InoutUtils;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
+import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
 import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
@@ -20,6 +22,7 @@ import com.glxp.sale.admin.req.inout.*;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.inout.WarehouseResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
+import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
 import com.glxp.sale.admin.service.basic.BussinessTypeService;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
@@ -32,10 +35,7 @@ import com.glxp.sale.admin.service.inout.CodesService;
 import com.glxp.sale.admin.service.receipt.MipsBarcodeService;
 import com.glxp.sale.admin.service.receipt.ProductInfoService;
 import com.glxp.sale.admin.thread.IoTransInoutService;
-import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.*;
-import com.glxp.sale.admin.util.FastJsonUtils;
-import com.glxp.sale.admin.util.FilterUdiUtils;
-import com.glxp.sale.admin.util.WarehousBeanUtils;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
@@ -74,6 +74,8 @@ public class WareHouseController {
     private BussinessTypeService bussinessTypeService;
     @Resource
     AuthAdminService authAdminService;
+    @Resource
+    BasicUnitMaintainService basicUnitMaintainService;
 
     @GetMapping("admin/warehouse/inout/list")
     public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@@ -225,6 +227,8 @@ public class WareHouseController {
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
         orderEntity1.setAction(addOrderRequest.getAction());
         orderEntity1.setMainAction(bussinessTypeEntity.getMainAction());
+        orderEntity1.setFromCorp(addOrderRequest.getFromCorp());
+        orderEntity1.setFromCorpId(addOrderRequest.getFromCorpId());
         orderEntity1.setLocStorageCode(addOrderRequest.getLocStorageCode());
         orderService.updateOrder(orderEntity1);
         return ResultVOUtils.success();
@@ -247,16 +251,33 @@ public class WareHouseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         try {
+            BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getBillType());
             String code = addOrderRequest.getCode();
             if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
             UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
             if (udiEntity == null)
                 return ResultVOUtils.error(500, "UDI码格式错误！");
             String orderId = addOrderRequest.getOrderId();
-//            CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId()));
+            if (addOrderRequest.getCustomerId() != null && (addOrderRequest.getFromCorpId() == null || "".equals(addOrderRequest.getFromCorpId()))) {
-//            addOrderRequest.setFromCorp(companyEntity.getCompanyName());
+                CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId()));
-//            addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk()));
+                addOrderRequest.setFromCorp(companyEntity.getCompanyName());
-            BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getBillType());
+                addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk()));
+            } else {
+                if (addOrderRequest.getFromCorpId() == null) {
+                    BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(addOrderRequest.getFromCorp());
+                    if (basicUnitMaintainEntity == null && bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
+                        basicUnitMaintainEntity = new BasicUnitMaintainEntity();
+                        basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
+                        addOrderRequest.setFromCorpId((basicUnitMaintainEntity.getErpId()));
+                        basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
+                        basicUnitMaintainEntity.setName(addOrderRequest.getFromCorp());
+                        addOrderRequest.setFromCorp(basicUnitMaintainEntity.getName());
+                        basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
+                    }
+                }
+            }
+
+
             if (StringUtils.isBlank(orderId)) {
                 orderId = System.currentTimeMillis() + new Random().nextInt(10) + "";
                 OrderEntity orderSaveRequest = new OrderEntity();
@@ -266,7 +287,6 @@ public class WareHouseController {
                 }
 
 
-
                 orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction());
                 orderSaveRequest.setAction(bussinessTypeEntity.getAction());
                 orderSaveRequest.setActor(addOrderRequest.getActor());

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java

@@ -1,11 +1,14 @@
 package com.glxp.sale.admin.controller.inout.utils;
 
+import cn.hutool.db.sql.Order;
 import com.glxp.sale.admin.constant.Constant;
 import com.glxp.sale.admin.constant.ConstantStatus;
+import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.sale.admin.entity.inout.*;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.req.inout.StockOrderFilterRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
+import com.glxp.sale.admin.service.basic.BussinessTypeService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.inout.OrderDetailService;
 import com.glxp.sale.admin.service.inout.OrderService;
@@ -31,6 +34,8 @@ public class CheckOrderUtils {
     StockOrderService stockOrderService;
     @Resource
     InvProductsTrService invProductsTrService;
+    @Resource
+    BussinessTypeService bussinessTypeService;
 
     public void check(String orderId, List<ErpOrderEntity> vailOrderEntities) {
         FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
@@ -38,7 +43,7 @@ public class CheckOrderUtils {
         List<ErpOrderEntity> myErpOrders = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
         OrderEntity orderEntity = orderService.findById(orderId);
         String errMsg = null;
-
+        BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
         for (ErpOrderEntity myErpOrder : myErpOrders) {
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
             filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode());
@@ -130,17 +135,18 @@ public class CheckOrderUtils {
                     StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
                     stockOrderFilterRequest.setBillNo(id);
                     StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
-                    stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+                    String status = getStockOrderStatus(orderEntity, bussinessTypeEntity);
+                    stockOrderEntity.setStatus(status);
                     stockOrderEntity.setOrderIdFk(orderId);
                     stockOrderService.updateById(stockOrderEntity);
-
                 }
             }
 
             //生成库存
-            if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
+//            if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
             invProductsTrService.genInvProducts(orderEntity.getId());
-            }
+
+//            }
 
 
         } else {
@@ -162,6 +168,39 @@ public class CheckOrderUtils {
 
     }
 
+    public String getStockOrderStatus(OrderEntity orderEntity, BussinessTypeEntity bussinessTypeEntity) {
+        if (bussinessTypeEntity.isSecCheckEnable()) {
+            if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIMS) {
+                if (bussinessTypeEntity.isSecCheckUdims()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_WEBNEW) {
+                if (bussinessTypeEntity.isSecCheckWebNew()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PDAED) {
+                if (bussinessTypeEntity.isSecCheckPdaEd()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PDAUN) {
+                if (bussinessTypeEntity.isSecCheckPdaUn()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PC) {
+                if (bussinessTypeEntity.isSecCheckPc()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_CHANGE) {
+                if (bussinessTypeEntity.isSecCheckChange()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
+            }
+        } else {
+            return ConstantStatus.SORDER_DELIVER;
+        }
+        return ConstantStatus.SORDER_DELIVER;
+    }
+
     //校验选入业务单据是否多出，多出，则添加到详情
     public boolean checkErpOrderExit(List<ErpOrderEntity> myErpOrders, ErpOrderEntity vailErpEntity) {
         for (ErpOrderEntity myErp : myErpOrders) {

api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java

@@ -2,12 +2,15 @@ package com.glxp.sale.admin.controller.param;
 
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.dao.info.ScheduledDao;
+import com.glxp.sale.admin.entity.info.ScheduledEntity;
 import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.req.param.SystemParamConfigRequest;
 import com.glxp.sale.admin.req.param.SystemParamConfigSaveRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.param.SystemParamConfigResponse;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
+import com.glxp.sale.admin.util.CronUtils;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
@@ -30,6 +33,9 @@ public class SystemParamConfigController {
 
     @Resource
     private SystemParamConfigService systemParamConfigService;
+    @Resource
+    ScheduledDao scheduledDao;
+
 
     @AuthRuleAnnotation("system/param/config/list")
     @GetMapping("/system/param/config/list")
@@ -90,13 +96,40 @@ public class SystemParamConfigController {
             }
             systemParamConfigService.updateParentId(systemParamConfigSaveRequest1);
         }
+
+
+        //出入库新增单据校验
+        if (systemParamConfigSaveRequest.getParamKey().equals("io_transInout_interval")) {
+            try {
+                int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
+                String cronStr = CronUtils.parseMinuteIntervel(time);
+                ScheduledEntity scheduledEntity = new ScheduledEntity();
+                scheduledEntity.setCron(cronStr);
+                scheduledEntity.setCronName("transInout");
+                scheduledDao.modifyScheduled(scheduledEntity);
+            } catch (Exception e) {
+                return ResultVOUtils.error(500, "格式错误！");
+            }
+        } else if (systemParamConfigSaveRequest.getParamKey().equals("io_erpcheck_interval")) {
+            try {
+                int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
+                String cronStr = CronUtils.parseMinuteIntervel(time);
+                ScheduledEntity scheduledEntity = new ScheduledEntity();
+                scheduledEntity.setCron(cronStr);
+                scheduledEntity.setCronName("erpCheck");
+                scheduledDao.modifyScheduled(scheduledEntity);
+            } catch (Exception e) {
+                return ResultVOUtils.error(500, "格式错误！");
+            }
+        }
+
         return ResultVOUtils.success("修改成功");
     }
 
 
     //key搜索
     @GetMapping("/udiwms/sys/config/selectByKey")
-    public BaseResponse selectByKey(@Valid SystemParamConfigRequest systemParamConfigRequest,
+    public BaseResponse selectByKey(SystemParamConfigRequest systemParamConfigRequest,
                                     BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {

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

@@ -10,6 +10,7 @@ public class BussinessLocalTypeEntity {
     private String name;
     private String localAction;
     private String originAction;
+    private String mainAction;
     private String localName;
     private String remark;
     private Boolean enable;

api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java

@@ -19,5 +19,6 @@ public class CompanyProductRelevanceEntity {
     private String auditStatus;
     private String productUuid;
     private Integer udiRlIdFk;
+    private String unitFk;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.req.basic;
 
 import com.glxp.sale.admin.req.ListPageRequest;
+import com.glxp.sale.admin.req.inout.StockOrderPostRequest;
 import lombok.Data;
 
 @Data
@@ -44,4 +45,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private String companyName;
     private Integer lockStatus;
     private Boolean isAdavence;
+    private String unitFk;
+    private String corpId;
+    private String billType;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.req.basic;
 
 import com.glxp.sale.admin.req.ListPageRequest;
+import com.glxp.sale.admin.req.inout.StockOrderPostRequest;
 import lombok.Data;
 
 @Data
@@ -42,6 +43,7 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String udplatCode;
     private String mainId;
     private Boolean isAdavence;
-
+    private String corpId;
+    private String billType;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java

@@ -18,7 +18,7 @@ public class UdiInfoExportRequest extends ListPageRequest {
     private String ggxh;
     private String thirdId;
     private String id;
-
+    private String unitFk;
     private String thirdId1;
     private String thirdId2;
     private String thirdId3;

api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyProductRelevanceRequest.java

@@ -10,4 +10,5 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
     private Long productId;
     private String productUuid;
     private String udiRlIdFk;
+    private String unitFk;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java

@@ -10,6 +10,7 @@ import java.util.List;
 public class StockOrderIdsRequest {
 
     String id;
+    List<StockSelectDataEntity> datas;
     List<String> ids;
     boolean filterUDIType;
     UdiEntity udiEntity;

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockSelectDataEntity.java

@@ -0,0 +1,11 @@
+package com.glxp.sale.admin.req.inout;
+
+import lombok.Data;
+
+@Data
+public class StockSelectDataEntity {
+    private String relId;
+    private String batchNo;
+    private String expireDate;
+    private String productDate;
+}

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

@@ -0,0 +1,15 @@
+package com.glxp.sale.admin.res.basic;
+
+import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
+import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UdiExportJsonResponse {
+
+    private List<UdiRelevanceEntity> udiRelevanceEntities;
+    private List<UdiInfoEntity> udiInfoEntities;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyProductRelevanceService.java

@@ -21,6 +21,8 @@ public interface CompanyProductRelevanceService {
 
     CompanyProductRelevanceEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId);
 
+    CompanyProductRelevanceEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk);
+
     CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity);
 
     List<CompanyProductRelevanceEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);

api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java

@@ -71,6 +71,18 @@ public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevan
         return companyProductRelevanceDao.findCompanyProductRelevanceByUdiRlIdFk(udiRlIdFk, customerId);
     }
 
+    @Override
+    public CompanyProductRelevanceEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk) {
+        FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
+        filterCompanyProductRelevanceRequest.setUdiRlIdFk(udiRlIdFk);
+        filterCompanyProductRelevanceRequest.setUnitFk(unitFk);
+        List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = companyProductRelevanceDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
+        if (companyProductRelevanceEntities.size() > 0) {
+            return companyProductRelevanceEntities.get(0);
+        }
+        return null;
+    }
+
     @Override
     public CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity) {
         return companyProductRelevanceDao.findCompanyProductRelevanceByProductUuid(companyProductRelevanceEntity);

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java

@@ -5,13 +5,12 @@ import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.constant.UdiInfoImportStatus;
 import com.glxp.sale.admin.entity.basic.*;
 import com.glxp.sale.admin.req.basic.*;
+import com.glxp.sale.admin.res.basic.UdiExportJsonResponse;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
-import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
+import com.glxp.sale.admin.service.basic.*;
-import com.glxp.sale.admin.service.basic.CorpExportLogService;
-import com.glxp.sale.admin.service.basic.UdiInfoExportLogService;
-import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.util.ExcelUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +18,9 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class BasicGenExcelService {
@@ -31,8 +32,10 @@ public class BasicGenExcelService {
     UdiInfoExportLogService udiInfoExportLogService;
     @Resource
     UdiRelevanceService udiRelevanceService;
+    @Resource
+    UdiInfoService udiInfoService;
 
-    //往来单位导出excel文件
+    //往来单位
     @Async
     public void exportCorp(String genKey, CorpsExportRequest corpsExportRequest) {
 
@@ -95,7 +98,6 @@ public class BasicGenExcelService {
         corpExportLogService.updateCorpExportLog(corpExportLogEntity);
     }
 
-    //上传往来单位SMP
     @Async
     public void uploadCorpSmp(String genKey, CorpsExportRequest corpsExportRequest) {
         PostCorpsRequest postCorpsRequest = new PostCorpsRequest();
@@ -140,6 +142,38 @@ public class BasicGenExcelService {
         corpExportLogService.updateCorpExportLog(corpExportLogEntity);
     }
 
+    public List<List<String>> genExcelData(BasicUnitMaintainFilterRequest filterUdiInfoRequest) {
+
+        List<List<String>> excelData = new ArrayList<>();
+        List<BasicUnitMaintainEntity> unitMaintainEntities = basicUnitMaintainService.filterList(filterUdiInfoRequest);
+        for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) {
+            List<String> rows = new ArrayList<>();
+            rows.add(basicUnitMaintainEntity.getErpId());
+            rows.add(basicUnitMaintainEntity.getName());
+            rows.add(basicUnitMaintainEntity.getSpell());
+            rows.add(basicUnitMaintainEntity.getAddr());
+            rows.add(basicUnitMaintainEntity.getContact());
+            rows.add(basicUnitMaintainEntity.getMobile());
+            rows.add(basicUnitMaintainEntity.getCreditNo());
+            rows.add(basicUnitMaintainEntity.getStatus());
+            rows.add(basicUnitMaintainEntity.getType());
+            rows.add(basicUnitMaintainEntity.getThirdId());
+            rows.add(basicUnitMaintainEntity.getThirdName());
+            rows.add(basicUnitMaintainEntity.getThirdId1());
+            rows.add(basicUnitMaintainEntity.getThirdName1());
+            rows.add(basicUnitMaintainEntity.getThirdId2());
+            rows.add(basicUnitMaintainEntity.getThirdName2());
+            rows.add(basicUnitMaintainEntity.getThirdId3());
+            rows.add(basicUnitMaintainEntity.getThirdName3());
+            rows.add(basicUnitMaintainEntity.getThirdId4());
+            rows.add(basicUnitMaintainEntity.getThirdName4());
+            excelData.add(rows);
+        }
+        return excelData;
+    }
+
+
+    //医疗器械信息---------------------------------------
     @Async
     public void exportUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
         UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
@@ -191,7 +225,57 @@ public class BasicGenExcelService {
         udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
         udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);
     }
+    @Async
+    public void exportJsonUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
+        UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
+        List<List<String>> excelData = new ArrayList<>();
+        List<String> head = new ArrayList<>();
+        head.add("udiCode");
+        head.add("医保编码");
+        head.add("商品条码");
+        head.add("thirdId");
+        head.add("thirdId1");
+        head.add("thirdId2");
+        head.add("thirdId3");
+        head.add("thirdId4");
+        head.add("是否以使用单元入库");
+        excelData.add(head);
+        //选中导出
+        if (udiInfoExportRequest.getUuids() != null && udiInfoExportRequest.getUuids().size() > 0) {
+            List<String> uuids = udiInfoExportRequest.getUuids();
+            for (String uuid : uuids) {
+                FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+                filterUdiInfoRequest.setUuid(uuid);
+                List<List<String>> genDatas = genExcelData(filterUdiInfoRequest);
+                if (genDatas != null && genDatas.size() > 0) {
+                    excelData.addAll(genDatas);
+                }
+            }
 
+        } else {//一键导出
+            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+            BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
+            filterUdiInfoRequest.setPage(null);
+            List<List<String>> genDatas = genExcelData(filterUdiInfoRequest);
+            if (genDatas != null && genDatas.size() > 0) {
+                excelData.addAll(genDatas);
+            }
+        }
+
+        String sheetName = "UDI产品信息对照";
+
+        File file = new File(udiInfoExportLogEntity.getFilePath());
+        if (!file.exists()) {
+            try {
+                file.createNewFile();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        new ExcelUtil().exportExcel(excelData, sheetName, udiInfoExportLogEntity.getFilePath(), 20);
+        udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
+        udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);
+    }
 
     @Async
     public void uploadProductsSmp(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
@@ -219,36 +303,6 @@ public class BasicGenExcelService {
         udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);
     }
 
-    public List<List<String>> genExcelData(BasicUnitMaintainFilterRequest filterUdiInfoRequest) {
-
-        List<List<String>> excelData = new ArrayList<>();
-        List<BasicUnitMaintainEntity> unitMaintainEntities = basicUnitMaintainService.filterList(filterUdiInfoRequest);
-        for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) {
-            List<String> rows = new ArrayList<>();
-            rows.add(basicUnitMaintainEntity.getErpId());
-            rows.add(basicUnitMaintainEntity.getName());
-            rows.add(basicUnitMaintainEntity.getSpell());
-            rows.add(basicUnitMaintainEntity.getAddr());
-            rows.add(basicUnitMaintainEntity.getContact());
-            rows.add(basicUnitMaintainEntity.getMobile());
-            rows.add(basicUnitMaintainEntity.getCreditNo());
-            rows.add(basicUnitMaintainEntity.getStatus());
-            rows.add(basicUnitMaintainEntity.getType());
-            rows.add(basicUnitMaintainEntity.getThirdId());
-            rows.add(basicUnitMaintainEntity.getThirdName());
-            rows.add(basicUnitMaintainEntity.getThirdId1());
-            rows.add(basicUnitMaintainEntity.getThirdName1());
-            rows.add(basicUnitMaintainEntity.getThirdId2());
-            rows.add(basicUnitMaintainEntity.getThirdName2());
-            rows.add(basicUnitMaintainEntity.getThirdId3());
-            rows.add(basicUnitMaintainEntity.getThirdName3());
-            rows.add(basicUnitMaintainEntity.getThirdId4());
-            rows.add(basicUnitMaintainEntity.getThirdName4());
-            excelData.add(rows);
-        }
-        return excelData;
-    }
-
     public List<List<String>> genExcelData(FilterUdiInfoRequest filterUdiInfoRequest) {
 
         List<List<String>> excelData = new ArrayList<>();
@@ -276,6 +330,27 @@ public class BasicGenExcelService {
         return excelData;
     }
 
+    public UdiExportJsonResponse genJsonData(FilterUdiInfoRequest filterUdiInfoRequest) {
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
+        List<UdiRelevanceEntity> udiRelevanceEntities = new ArrayList<>();
+        Map<String, String> filterUuid = new HashMap<>();
+        for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
+            UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+            BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity);
+            udiRelevanceEntities.add(udiRelevanceEntity);
+            filterUuid.put(udiRelevanceEntity.getUuid(), udiRelevanceEntity.getUuid());
+        }
+        List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
+        filterUuid.forEach((key, value) -> {
+            List<UdiInfoEntity> udiInfoEntities1 = udiInfoService.findByUuids(key);
+            udiInfoEntities.addAll(udiInfoEntities1);
+        });
+        UdiExportJsonResponse udiExportJsonResponse = new UdiExportJsonResponse();
+        udiExportJsonResponse.setUdiInfoEntities(udiInfoEntities);
+        udiExportJsonResponse.setUdiRelevanceEntities(udiRelevanceEntities);
+        return udiExportJsonResponse;
+    }
+
     public List<UdiInfoImportDetailEntity> genSmpData(FilterUdiInfoRequest filterUdiInfoRequest) {
         List<UdiInfoImportDetailEntity> udiInfoImportDetailEntities = new ArrayList<>();
         List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);

api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java

@@ -31,6 +31,7 @@ public class CompanyProductsRelService {
                 companyProductRelevanceEntity.setCreate_time(new Date());
                 companyProductRelevanceEntity.setUpdate_time(new Date());
                 companyProductRelevanceEntity.setAuditStatus("3");
+                companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
                 companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(uuid));
                 companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
                 boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
@@ -46,6 +47,7 @@ public class CompanyProductsRelService {
                 companyProductRelevanceEntity.setCreate_time(new Date());
                 companyProductRelevanceEntity.setUpdate_time(new Date());
                 companyProductRelevanceEntity.setAuditStatus("3");
+                companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
                 companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId());
                 companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid());
                 companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());

api-admin/src/main/java/com/glxp/sale/admin/thread/IoErpCheckTask.java

@@ -0,0 +1,45 @@
+package com.glxp.sale.admin.thread;
+
+import com.glxp.sale.admin.dao.info.ScheduledDao;
+import com.glxp.sale.admin.entity.info.ScheduledEntity;
+import com.glxp.sale.admin.req.udid.ScheduledRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+@EnableScheduling
+public class IoErpCheckTask implements SchedulingConfigurer {
+
+    final Logger logger = LoggerFactory.getLogger(IoErpCheckTask.class);
+    @Resource
+    protected ScheduledDao scheduledDao;
+    @Resource
+    private IoTransInoutService ioTransInoutService;
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        scheduledTaskRegistrar.addTriggerTask(() -> process(),
+                triggerContext -> {
+                    ScheduledRequest scheduledRequest = new ScheduledRequest();
+                    scheduledRequest.setCronName("erpCheck");
+                    ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
+                    String cron = scheduledEntity.getCron();
+                    if (cron.isEmpty()) {
+                        logger.error("cron is null");
+                    }
+                    return new CronTrigger(cron).nextExecutionTime(triggerContext);
+                });
+    }
+
+    private void process() {
+        logger.info("定时校验ERP单---暂停");
+//        ioTransInoutService.checkOrder();
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java

@@ -4,6 +4,7 @@ import com.glxp.sale.admin.config.WebSocketServer;
 import com.glxp.sale.admin.constant.Constant;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.constant.ConstantType;
+import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils;
 import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
 import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
 import com.glxp.sale.admin.controller.inout.utils.InoutUtils;
@@ -91,7 +92,8 @@ public class IoTransInoutService {
     CompanyService companyService;
     @Resource
     InvWarehouseService invWarehouseService;
-
+    @Resource
+    private CheckOrderUtils checkOrderUtils;
     @Resource
     InvProductDetailService invProductDetailService;
 
@@ -241,9 +243,19 @@ public class IoTransInoutService {
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
             orderService.updateOrder(orderEntity);
             return;
+        } else if (orderEntity.getFromCorpId() == null) {
+            BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(orderEntity.getFromCorp());
+            if (basicUnitMaintainEntity == null) {
+                orderEntity.setRemark("未选择往来单位");
+                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+                orderService.updateOrder(orderEntity);
+                return;
+            } else {
+                orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId());
+            }
         }
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
-        if (bussinessTypeEntity.isGenUnit()) {
+        if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
             BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
             basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
             basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
@@ -437,9 +449,10 @@ public class IoTransInoutService {
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
             orderService.updateOrder(orderEntity);
 //            orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS);
-            if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
+//            if (orderEntity.getCustomerId() == null && orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
+//
+//            }
             invProductsTrService.genInvProducts(orderEntity.getId());
-            }
             printOrder(orderEntity.getId());
         }
     }
@@ -490,6 +503,7 @@ public class IoTransInoutService {
         FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
         filterErpOrderRequest.setOrderId(orderId);
         List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
+        int checkStatus = ConstantStatus.ORDER_STATUS_CHECK;
         if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
             for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
 
@@ -498,9 +512,11 @@ public class IoTransInoutService {
                 filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode());
                 List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
                 if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) {
+
                     erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
                     myErpOrderService.updateErpOrder(erpOrderEntity);
                     orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID");
+                    checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
                     orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
                     orderService.updateOrder(orderEntity);
@@ -513,15 +529,34 @@ public class IoTransInoutService {
                             erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_MUTI);
                             orderEntity.setRemark("该产品绑定多个供应商");
                         }
+                        checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
                         orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
                         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
                         orderService.updateOrder(orderEntity);
                     } else {
-                        orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
+                        if (bussinessTypeEntity.getCorpType() != ConstantStatus.CORP_TYPE_INNOR) {
+                            CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(erpOrderEntity.getBindRlFk(), erpOrderEntity.getSupId());
+                            if (companyProductRelevanceEntity == null) {
+                                orderEntity.setRemark(erpOrderEntity.getCoName() + "该产品非此供应商配送");
+                                checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
+                                orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
+                                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+                                orderService.updateOrder(orderEntity);
+                            } else {
+                                orderEntity.setContrastStatus(checkStatus);
+                                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+                                orderService.updateOrder(orderEntity);
+                                erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_ONE);
+                            }
+                        } else {
+                            orderEntity.setContrastStatus(checkStatus);
                             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
                             orderService.updateOrder(orderEntity);
                             erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_ONE);
                         }
+
+
+                    }
                 }
                 myErpOrderService.updateErpOrder(erpOrderEntity);
 
@@ -532,6 +567,12 @@ public class IoTransInoutService {
 
     }
 
+    public void updateSuccess(OrderEntity orderEntity, int checkStatus, int status, String remark) {
+        orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
+        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+        orderService.updateOrder(orderEntity);
+    }
+
 
     //    //校验ERP单
     @Async
@@ -554,26 +595,25 @@ public class IoTransInoutService {
     }
 
     public void checkOrder(OrderEntity orderEntity) {
-
-
         orderEntity = orderService.findById(orderEntity.getId());
         List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
         List<WarehouseEntity> transData = warehouseService.findByReceiptId(orderEntity.getId());
-
+        myErpOrderService.deleteByOrderId(orderEntity.getId());
+        genOrderDetail(transData);
         if (erpIds != null && erpIds.size() > 0) {
             List<ErpOrderEntity> erpOrderEntities = thrDataService.getStockOrders(erpIds);
-            checkThirdOrder(erpOrderEntities, orderEntity, transData);
+            checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
         } else {
-            orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
+//            orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+//            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
-            orderEntity.setRemark("未选入第三方出入库单据进行校验，请手动选择");
+//            orderEntity.setRemark("未选入第三方出入库单据进行校验，请手动选择");
-            orderService.updateOrder(orderEntity);
+//            orderService.updateOrder(orderEntity);
-            myErpOrderService.deleteByOrderId(orderEntity.getId());
+//            myErpOrderService.deleteByOrderId(orderEntity.getId());
-            new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData);
+//            new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData);
-            printOrder(orderEntity.getId());
+//            printOrder(orderEntity.getId());
-            if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
+//            if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
-                invProductsTrService.genInvProducts(orderEntity.getId());
+//                invProductsTrService.genInvProducts(orderEntity.getId());
-            }
+//            }
         }
 
 
@@ -635,6 +675,7 @@ public class IoTransInoutService {
 
     public void syncprintOrder(String orderId) {
         OrderEntity orderEntity = orderService.findById(orderId);
+        BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && orderEntity.getErpFk() == null
         ) {
 
@@ -642,7 +683,7 @@ public class IoTransInoutService {
             FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
             filterErpOrderRequest.setOrderId(orderId);
             List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
-            BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
+
 
             //生成业务单据详情
             List<StockOrderDetailEntity> stockOrderDetailEntities = new ArrayList<>();
@@ -722,7 +763,7 @@ public class IoTransInoutService {
                     StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
                     stockOrderFilterRequest.setBillNo(erpIds[i]);
                     StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
-                    stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+                    stockOrderEntity.setStatus(new CheckOrderUtils().getStockOrderStatus(orderEntity, bussinessTypeEntity));
                     stockOrderService.updateById(stockOrderEntity);
                 }
             }

api-admin/src/main/java/com/glxp/sale/admin/util/CronUtils.java

@@ -0,0 +1,32 @@
+package com.glxp.sale.admin.util;
+
+public class CronUtils {
+
+    public static String parseSecondIntervel(String time) {
+        int second = Integer.parseInt(time);
+        String cron = "0/" + second + " " + "*" + " " + "* * * ?";//start[1] + "-" + end[1]
+        if (second >= 60) {
+            second = Math.round(second / 60);
+            if (second >= 60) {
+                second = 59;
+            }
+            cron = "0" + " " + "0/" + second + " " + "* * * ?";
+        }
+        return cron;
+    }
+
+
+    public static String parseMinuteIntervel(int time) {
+        int minute = time;
+        String cron = "0" + " " + "0/" + minute + " " + "* * * ?";
+        if (minute >= 60) {
+            minute = Math.round(minute / 60);
+            if (minute >= 60) {
+                minute = 59;
+            }
+            cron = "0" + " " + "0" + " " + "0/" + minute + " " + "* * ?";
+        }
+        return cron;
+    }
+
+}

api-admin/src/main/resources/application-pro.properties

@@ -29,7 +29,7 @@ logging.level.com.glxp.api.admin.dao.inventory=debug
 logging.level.com.glxp.api.admin.dao.thrsys=debug
 # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002
 logging.file=D:/1s/udiwms/udiwms.log
-#file_path=/home/anthony/udiwms
+#file_path=/home/glxpdata/udiwms
 file_path=D:/1s/udiwms
 #UDI\u6570\u636E\u4E0B\u8F7D
 UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df

api-admin/src/main/resources/logback-spring.xml

@@ -38,7 +38,7 @@
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 每天一归档 -->
-            <fileNamePattern>/home/anthony/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log
+            <fileNamePattern>/home/glxpdata/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log
             </fileNamePattern>
             <maxHistory>30</maxHistory>
             <timeBasedFileNamingAndTriggeringPolicy
@@ -58,8 +58,8 @@
             <level>ERROR</level>
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天一归档 -->
+            <!-- 每天一归档   /home/glxpdata/udiwms -->
-            <fileNamePattern>d:/1s/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log
+            <fileNamePattern>/home/glxpdata/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log
             </fileNamePattern>
             <maxHistory>30</maxHistory>
             <timeBasedFileNamingAndTriggeringPolicy

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

@@ -32,7 +32,7 @@
         SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction,
         basic_bussiness_type.name ,
         basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable
-        , basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType
+        , basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
         FROM basic_bustype_local inner join
         basic_bussiness_type
         on basic_bustype_local.action = basic_bussiness_type.localAction

api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml

@@ -14,6 +14,9 @@
             <if test="udiRlIdFk != '' and udiRlIdFk!=null">
                 and udiRlIdFk = #{udiRlIdFk}
             </if>
+            <if test="unitFk != null and unitFk != ''">
+                and unitFk = #{unitFk}
+            </if>
         </where>
         ORDER BY id DESC
     </select>
@@ -125,7 +128,9 @@
             <if test="isAdavence != '' and isAdavence != null">
                 AND basic_udirel.isAdavence = #{isAdavence}
             </if>
-
+            <if test="unitFk != null and unitFk != ''">
+                and unitFk = #{unitFk}
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>
@@ -168,6 +173,9 @@
             <if test="productUuid != null and productUuid != ''">
                 and productUuid = #{productUuid}
             </if>
+            <if test="unitFk != null and unitFk != ''">
+                and unitFk = #{unitFk}
+            </if>
         </where>
     </select>
 
@@ -185,6 +193,10 @@
             <if test="productUuid != null and productUuid != ''">
                 and productUuid = #{productUuid}
             </if>
+            <if test="unitFk != null and unitFk != ''">
+                and unitFk = #{unitFk}
+            </if>
+
         </where>
 
     </select>
@@ -202,6 +214,8 @@
             <if test="auditStatus != null">auditStatus=#{auditStatus},</if>
             <if test="productUuid != null">productUuid=#{productUuid},</if>
             <if test="udiRlIdFk != null">udiRlIdFk=#{udiRlIdFk},</if>
+            <if test="unitFk != null">unitFk=#{unitFk},</if>
+
         </set>
         WHERE id = #{id}
     </update>
@@ -210,7 +224,7 @@
             parameterType="com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity">
         replace
         INTO company_product_relevance(customerId,productId,enterpriseId,registrationId,
-       create_time,update_time,auditStatus,productUuid,udiRlIdFk) values
+       create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk) values
        (
         #{customerId},
         #{productId},
@@ -220,7 +234,7 @@
         #{update_time},
         #{auditStatus},
         #{productUuid},
-        #{udiRlIdFk}
+        #{udiRlIdFk},#{unitFk}
         )
     </insert>
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -143,6 +143,10 @@
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
             </if>
+            <if test="fromCorpId != '' and fromCorpId!=null">
+                and fromCorpId =#{fromCorpId}
+            </if>
+
             <if test="action != '' and action!=null">
                 and action = #{action}
             </if>
@@ -200,6 +204,9 @@
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
             </if>
+            <if test="fromCorpId != '' and fromCorpId!=null">
+                and fromCorpId =#{fromCorpId}
+            </if>
             <if test="action != '' and action!=null">
                 and action = #{action}
             </if>
@@ -273,6 +280,9 @@
             <if test="stockCheckFk != '' and stockCheckFk!=null">
                 and stockCheckFk = #{stockCheckFk}
             </if>
+            <if test="fromCorpId != '' and fromCorpId!=null">
+                and fromCorpId =#{fromCorpId}
+            </if>
             <if test="receiveStatus != '' and receiveStatus!=null">
                 and receiveStatus = #{receiveStatus}
             </if>
@@ -297,7 +307,9 @@
             <if test="corpOrderId != '' and corpOrderId !=null">
                 and corpOrderId =#{corpOrderId}
             </if>
-
+            <if test="fromCorpId != '' and fromCorpId!=null">
+                and fromCorpId =#{fromCorpId}
+            </if>
             <if test="action != '' and action!=null">
                 and `action` =#{action}
             </if>