任务modify，权限验证，udims

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

@@ -207,6 +207,7 @@ public class LoginController {
             CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
             authLicense.setCompanyName(companyEntity.getCompanyName());
             authLicense.setCreateDate(new Date());
+            authLicenseDao.romveByCustomerId(authAdmin.getCustomerId() + "");
             authLicenseDao.save(authLicense);
         }
         return ResultVOUtils.success(authLicense);

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

@@ -83,6 +83,7 @@ public class RegisterController {
 
     @Resource
     private SystemParamConfigService systemParamConfigService;
+
     @AuthRuleAnnotation("")
     @GetMapping("salewarehouse/register/list")
     public BaseResponse filterList(UserResisterFilterRequest userResisterFilterRequest) {
@@ -96,7 +97,6 @@ public class RegisterController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @AuthRuleAnnotation("")
     @PostMapping("salewarehouse/register/getCheckcode")
     public BaseResponse getCheckcode(@RequestBody CheckCodeRequest checkCodeRequest, HttpSession httpSession) {
 
@@ -138,7 +138,6 @@ public class RegisterController {
             return ResultVOUtils.error(500, "验证码发送失败");
 
     }
-    @AuthRuleAnnotation("")
     @GetMapping("salewarehouse/register/checkCompany")
     public BaseResponse checkCompany(@RequestParam("companyName") String companyName) {
         if (StringUtils.isBlank(companyName)) return ResultVOUtils.error(ResultEnum.DATA_ERROR, "企业名称不能为空");
@@ -150,7 +149,6 @@ public class RegisterController {
         }
 
     }
-    @AuthRuleAnnotation("")
     @GetMapping("salewarehouse/register/getRegisterConfig")
     public BaseResponse getRegisterConfig() {
 
@@ -179,7 +177,6 @@ public class RegisterController {
         return ResultVOUtils.success("删除成功");
     }
 
-    @AuthRuleAnnotation("")
     @PostMapping("salewarehouse/register/update")
     public BaseResponse updateRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity,
                                        BindingResult bindingResult) {
@@ -194,7 +191,6 @@ public class RegisterController {
         return ResultVOUtils.success("添加成功");
     }
 
-    @AuthRuleAnnotation("")
     @PostMapping("salewarehouse/register/save")
     public BaseResponse saveRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, HttpSession httpSession,
                                      BindingResult bindingResult) {
@@ -246,7 +242,6 @@ public class RegisterController {
         return ResultVOUtils.success(userRegisterEntity.getUserName());
     }
 
-    @AuthRuleAnnotation("")
     @PostMapping("salewarehouse/reset/passwd")
     public BaseResponse resetPasswd(@RequestBody @Valid ResetPasswdRequest resetPasswdRequest, HttpSession httpSession,
                                     BindingResult bindingResult) {

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

@@ -67,7 +67,6 @@ public class BasicUnitMaintainController {
     @Resource
     private OrderService orderService;
 
-    @AuthRuleAnnotation("")
     @GetMapping("/udiwms/basic/unit/maintain/filter")
     public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
                                                 BindingResult bindingResult) {
@@ -95,7 +94,6 @@ public class BasicUnitMaintainController {
         return ResultVOUtils.success(rMap);
     }
 
-    @AuthRuleAnnotation("")
     @GetMapping("/udiwms/basic/unit/maintain/filter2")
     public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
                                                  BindingResult bindingResult) {

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

@@ -33,6 +33,7 @@ public class BussinessChangeTypeController {
     private BussinessTypeService bussinessTypeService;
     @Resource
     private BussinessLocalTypeService bussinessLocalTypeService;
+
     @AuthRuleAnnotation("")
     @GetMapping("/spms/bussinessChangeType/filter")
     public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@@ -43,7 +44,7 @@ public class BussinessChangeTypeController {
         List<BussinessChangeTypeEntity> bussinessTypeEntities;
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getAction());
         if (bussinessLocalTypeEntity == null) {
-            return ResultVOUtils.error(500, "该业务类型未绑定扫码单据类型！");
+            return ResultVOUtils.error(499, "该业务类型未绑定扫码单据类型！");
         }
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction());
         bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
@@ -53,15 +54,16 @@ public class BussinessChangeTypeController {
             if (bussinessTypeFilterRequest.getType() != null
                     && "changeEnable".equals(bussinessTypeFilterRequest.getType())
             ) {
-                if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
+//                if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
-                    BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
+//                    BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
-                    bussinessChangeTypeEntity1.setIntro("入库自动补\"寄售出库单\"");
+//                    bussinessChangeTypeEntity1.setIntro("入库自动补\"寄售出库单\"");
-                    bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_OUT);
+//                    bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_OUT);
-                    bussinessChangeTypeEntity1.setIndex(1);
+//                    bussinessChangeTypeEntity1.setIndex(1);
-                    bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
+//                    bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
-                    bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
+//                    bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
-                    bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
+//                    bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
-                } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
+//                } else
+                if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
                     BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
                     bussinessChangeTypeEntity1.setIntro("出库自动补\"入库单\"");
                     bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
@@ -76,8 +78,6 @@ public class BussinessChangeTypeController {
                     bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2);
                     bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
                 } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) {
-
-
                     BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
                     bussinessChangeTypeEntity1.setIntro("出库自动补\"寄售入库单\"");
                     bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN);

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

@@ -51,6 +51,7 @@ public class BussinessTypeController {
     private AuthAdminService authAdminService;
     @Resource
     private OrderService orderService;
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/bussinessType/filter")
     public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@@ -95,6 +96,26 @@ public class BussinessTypeController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
+    @GetMapping("/udiwms/bussinessType/udimsFilter")
+    public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest,
+                                                BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        bussinessTypeFilterRequest.setSpUse(true);
+        List<BussinessTypResponse> bussinessTypeEntities;
+        bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
+        PageInfo<BussinessTypResponse> pageInfo;
+        pageInfo = new PageInfo<>(bussinessTypeEntities);
+        PageSimpleResponse<BussinessTypResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(bussinessTypeEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/bussinessType/delete")
     public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@@ -204,7 +225,7 @@ public class BussinessTypeController {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR);
         }
         List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.candidateBussinessType(cndidateRequest.getMainAction());
-        if(!StrUtil.isEmpty(cndidateRequest.getCurAction())){
+        if (!StrUtil.isEmpty(cndidateRequest.getCurAction())) {
             BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(cndidateRequest.getCurAction());
             bussinessTypeEntities.add(bussinessTypeEntity);
         }

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

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.basic;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.BasicProcessStatus;
@@ -43,6 +44,7 @@ public class CorpImportLogController {
     BasicThirdSysService basicThirdSysService;
     @Resource
     BasicCorpImportService basicCorpImportService;
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/corps/importLog/filter")
     public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest,
@@ -60,6 +62,7 @@ public class CorpImportLogController {
         pageSimpleResponse.setList(udiInfoImportLogEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/corps/importLog/filterDetail")
     public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest,
@@ -133,7 +136,7 @@ public class CorpImportLogController {
                 String fileType = fileName.substring(fileName.lastIndexOf("."));
                 if (".udi".equals(fileType.toLowerCase())) {
                     String jsonData = IoUtil.read(file.getInputStream()).toString();
-                    List<BasicUnitMaintainEntity> basicUnitMaintainEntities = JSONUtil.toList(jsonData, BasicUnitMaintainEntity.class);
+                    List<BasicUnitMaintainEntity> basicUnitMaintainEntities = JSON.parseArray(jsonData, BasicUnitMaintainEntity.class);
 
                     //导入日志
                     CorpImportLogEntity corpImportLogEntity = new CorpImportLogEntity();

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

@@ -186,4 +186,5 @@ public class UdiInfoExportLogController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
 }

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

@@ -1,7 +1,9 @@
 package com.glxp.sale.admin.controller.basic;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.BasicProcessStatus;
@@ -139,8 +141,10 @@ public class UdiInfoImportLogController {
                 }
                 //导入数据
                 String jsonData = IoUtil.read(file.getInputStream()).toString();
-                UdiRelevanceExportJsonResponse importData = JSONUtil.toBean(jsonData, UdiRelevanceExportJsonResponse.class);
+//                UdiRelevanceExportJsonResponse importData = JSON.parse(jsonData, UdiRelevanceExportJsonResponse.class);
-
+                UdiRelevanceExportJsonResponse importData =
+                        JSONObject.parseObject(jsonData, new TypeReference<UdiRelevanceExportJsonResponse>() {
+                        });
                 //导入日志
                 UdiInfoImportLogEntity importLog = new UdiInfoImportLogEntity();
                 String genKey = CustomUtil.getId();
@@ -171,7 +175,6 @@ public class UdiInfoImportLogController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         String genKey = postUdiInfoRequest.getGenKey();
         if (genKey == null) {
             genKey = CustomUtil.getId();
@@ -201,6 +204,27 @@ public class UdiInfoImportLogController {
         return ResultVOUtils.success("上传成功");
     }
 
+    //中转服务产品信息接口上传
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/products/sync/upload")
+    public BaseResponse postSyncUdiInfo(@RequestBody UdiRelevanceExportJsonResponse postUdiInfoRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String genKey = CustomUtil.getId();
+        UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey);
+        udiInfoImportLogEntity = new UdiInfoImportLogEntity();
+        udiInfoImportLogEntity.setGenKey(genKey);
+        udiInfoImportLogEntity.setFromType("接口上传");
+        udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
+        udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
+        udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity);
+        udiInfoImportService.importJsonData(postUdiInfoRequest);
+        udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
+        udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity);
+        return ResultVOUtils.success("上传成功");
+    }
+
 
     //扫码精灵产品信息接口上传
     @AuthRuleAnnotation("")

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

@@ -435,9 +435,11 @@ public class OrderController {
         if (StrUtil.isBlank(billNo)) {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR);
         }
-        return orderService.supplementOrder(billNo);
-    }
 
+        StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(billNo);
+
+        return orderService.supplementOrder(stockOrderEntity.getOrderIdFk());
+    }
 
 
 }

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

@@ -130,23 +130,21 @@ public class CheckOrderUtils {
 
             //更新业务单据为已校验
             List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
+            String status = "";
             if (erpIds != null && erpIds.size() > 0) {
                 for (String id : erpIds) {
                     StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
                     stockOrderFilterRequest.setBillNo(id);
                     StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
-                    String status = getStockOrderStatus(orderEntity, bussinessTypeEntity);
+                    status = getStockOrderStatus(orderEntity, bussinessTypeEntity);
                     stockOrderEntity.setStatus(status);
                     stockOrderEntity.setOrderIdFk(orderId);
                     stockOrderService.updateById(stockOrderEntity);
                 }
             }
-
+            if (status.equals(ConstantStatus.SORDER_DELIVER)) {
-            //生成库存
+                invProductsTrService.genInvProducts(orderEntity.getId());
-//            if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
+            }
-            invProductsTrService.genInvProducts(orderEntity.getId());
-
-//            }
 
 
         } else {

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java

@@ -78,10 +78,28 @@ public class InvWarehouseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        if (invWarehouseEntity.getPid() == null) {
+        if (invWarehouseEntity.getPid() == null) {//仓库
             invWarehouseEntity.setPid(0); // 默认设置
+            FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+            filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid());
+            InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
+            invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
+        } else {//货位
+
+            FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+            filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid());
+            InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
+            InvWarehouseEntity pEntity = invWarehouseService.selectById(invWarehouseEntity.getPid() + "");
+            if(codeEntity == null){
+                int code = Integer.parseInt(pEntity.getCode()) * 1000;
+                invWarehouseEntity.setCode(code + "");
+            }else {
+                invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
+            }
+            invWarehouseEntity.setAdvanceType(pEntity.getAdvanceType());
+            invWarehouseEntity.setLevel(pEntity.getLevel());
+            invWarehouseEntity.setPcode(pEntity.getPcode());
         }
-
         boolean b = invWarehouseService.insertInvWarehouse(invWarehouseEntity);
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpImportLogController.java

@@ -1,7 +1,6 @@
 package com.glxp.sale.admin.controller.thrsys;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.BasicProcessStatus;
@@ -118,7 +117,7 @@ public class ThrCorpImportLogController {
                 }
                 //导入数据
                 String jsonData = IoUtil.read(file.getInputStream()).toString();
-                List<ThrCorpEntity> thrCorpEntities = JSONUtil.toList(jsonData, ThrCorpEntity.class);
+                List<ThrCorpEntity> thrCorpEntities = com.alibaba.fastjson.JSON.parseArray(jsonData, ThrCorpEntity.class);
 
                 //导入日志
                 ThrCorpImportLogEntity importLog = new ThrCorpImportLogEntity();

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpsController.java

@@ -38,7 +38,6 @@ public class ThrCorpsController {
     @Resource
     private ThrCorpImportLogService thrCorpImportLogService;
 
-    @AuthRuleAnnotation("")
     @GetMapping("/udiwms/thrsys/getCorps")
     public BaseResponse getCorps(FilterThrCorpRequest filterThrCorpRequest,
                                  BindingResult bindingResult) {

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.thrsys;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.BasicProcessStatus;
@@ -119,7 +120,7 @@ public class ThrProductsImportLogController {
                 }
                 //导入数据
                 String jsonData = IoUtil.read(file.getInputStream()).toString();
-                List<ThrProductsEntity> thrProductsEntities = JSONUtil.toList(jsonData, ThrProductsEntity.class);
+                List<ThrProductsEntity> thrProductsEntities = JSON.parseArray(jsonData, ThrProductsEntity.class);
 
                 //导入日志
                 ThrProductsImportLogEntity importLog = new ThrProductsImportLogEntity();

api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthLicenseDao.java

@@ -8,9 +8,14 @@ import java.util.List;
 
 @Mapper
 public interface AuthLicenseDao {
-    
+
-	AuthLicense get(String id);
+    AuthLicense get(String id);
-	int save(AuthLicense authLicense);
+
-	int update(AuthLicense authLicense);
+    int save(AuthLicense authLicense);
-	int remove(String appid);
+
+    int update(AuthLicense authLicense);
+
+    int remove(String appid);
+
+    int romveByCustomerId(String customerId);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java

@@ -10,6 +10,8 @@ public interface InvWarehouseDao {
 
     List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
 
+    InvWarehouseEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);
+
     List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
 
     boolean insertInvWarehouse(InvWarehouseEntity InvWarehouseEntity);

api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvWarehouseEntity.java

@@ -17,6 +17,7 @@ public class InvWarehouseEntity {
     private Integer status;
     private Date updateTime;
     private String remark;
-
+    private Integer level;
+    private String pcode;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java

@@ -15,4 +15,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private Boolean advanceType;
     private Boolean isDefault;
     private Date updateTime;
+
+    private Integer level;
+    private String pcode;
 }

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

@@ -7,7 +7,7 @@ import lombok.Data;
 public class FilterStockRequest extends ListPageRequest {
     private String code;
     private String codeLevel;
-    private String pCode;
+    private String pcode;
     private String orderId;
     private String batchNo;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvWarehouseResponse.java

@@ -20,6 +20,8 @@ public class InvWarehouseResponse {
     private Date updateTime;
     private String remark;
 
+    private Integer level;
+    private String pcode;
     private List<InvWarehouseResponse> children;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

@@ -195,6 +195,8 @@ public class OrderServiceImpl implements OrderService {
             //此类型单据不可补单
             return ResultVOUtils.error(ResultEnum.valueOf("此类型单据不可补单"));
         }
+
+
         OrderEntity supplementOrder = new OrderEntity();
         BeanUtil.copyProperties(order, supplementOrder);
         //生成补单单号
@@ -214,27 +216,35 @@ public class OrderServiceImpl implements OrderService {
         supplementOrder.setFromCorp(name);
         supplementOrder.setFromType(ConstantStatus.FROM_CHANGE);
 
-        //复制码表
-        WarehouseEntity code = codesDao.getByCorpOrderId(order.getCorpOrderId());
-        WarehouseEntity supplementCode = new WarehouseEntity();
-        BeanUtil.copyProperties(code, supplementCode);
-        supplementCode.setFromCorpId(supplementOrder.getFromCorpId());
-        supplementCode.setFromCorp(supplementOrder.getFromCorp());
-        supplementCode.setLocStorageCode(supplementCode.getLocStorageCode());
-
-        supplementCode.setOrderId(supplementOrderNo);
-        //查询补单设置
-        supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType());
         BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
-        supplementCode.setMainAction(supplementType.getMainAction());
+        supplementOrder.setMainAction(supplementType.getMainAction());
-        supplementCode.setId(null);
+        supplementOrder.setAction(supplementType.getAction());
 
+        //复制码表
+        List<WarehouseEntity> codes = codesDao.findByReceiptId(order.getId());
+        List<WarehouseEntity> supplementCodes = new ArrayList<>();
+        codes.forEach(
+                code -> {
+                    WarehouseEntity supplementCode = new WarehouseEntity();
+                    BeanUtil.copyProperties(code, supplementCode);
+                    supplementCode.setFromCorpId(supplementOrder.getFromCorpId());
+                    supplementCode.setFromCorp(supplementOrder.getFromCorp());
+                    supplementCode.setLocStorageCode(supplementCode.getLocStorageCode());
+                    supplementCode.setOrderId(supplementOrderNo);
+                    //查询补单设置
+                    supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType());
+                    supplementCode.setMainAction(supplementType.getMainAction());
+                    supplementCode.setId(null);
+                    supplementCodes.add(supplementCode);
+
+                }
+        );
         //更新数据
         try {
             orderDao.insertOrder(supplementOrder);
             //更新配货单表对应单据的补单单号
             stockOrderDao.updateSupplementNoByBillNo(billNo, supplementOrderNo);
-            codesTempDao.insertCodesTempSingle(supplementCode);
+            codesTempDao.insertCodesTemp(supplementCodes);
         } catch (Exception e) {
             log.error("补单数据插入失败");
         }
@@ -250,7 +260,7 @@ public class OrderServiceImpl implements OrderService {
         stockOrderEntityList.forEach(stockOrderEntity -> {
             StockOrderResponse response = new StockOrderResponse();
             BeanUtil.copyProperties(stockOrderEntity, response);
-            String supplementOrderType = bussinessTypeDao.selectEnableSupplementOrder(stockOrderEntity.getBillNo());
+            String supplementOrderType = bussinessTypeDao.selectEnableSupplementOrder(stockOrderEntity.getOrderIdFk());
             if (StrUtil.isBlank(supplementOrderType) || StrUtil.isNotBlank(stockOrderEntity.getSupplementNo())) {
                 response.setEnableSupplementOrder(false);
             } else {

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java

@@ -10,6 +10,8 @@ public interface InvWarehouseService {
 
     InvWarehouseEntity findDefault(Boolean advaceType, Boolean isDefault);
 
+    InvWarehouseEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);
+
     List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
 
     List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java

@@ -31,6 +31,11 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         return null;
     }
 
+    @Override
+    public InvWarehouseEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        return invWarehouseDao.selectMaxCode(filterInvWarehouseRequest);
+    }
+
     @Override
     public List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
         if (filterInvWarehouseRequest == null) {

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

@@ -3,11 +3,14 @@ package com.glxp.sale.admin.thread;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
 import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
+import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity;
 import com.glxp.sale.admin.httpclient.ErpBasicClient;
 import com.glxp.sale.admin.req.basic.BasicUnitMaintainFilterRequest;
+import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.ErpUnitsResponse;
 import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
+import com.glxp.sale.admin.service.thrsys.ThrCorpService;
 import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.common.res.BaseResponse;
 import org.springframework.beans.BeanUtils;
@@ -17,13 +20,14 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class BasicUnitImportService {
     @Resource
     private BasicUnitMaintainService basicUnitMaintainService;
-
+    @Resource
-
+    private ThrCorpService thrCorpService;
 
     @Async
     public void selectAllUnit(BasicThirdSysDetailEntity basicThirdSysDetailEntity, BasicUnitMaintainFilterRequest unitMaintainFilterRequest) {
@@ -50,6 +54,20 @@ public class BasicUnitImportService {
             imports.addAll(erpUnitsResponses);
 
         } else {
+            FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
+            BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
+            filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
+            filterThrCorpRequest.setPage(null);
+            List<ThrCorpEntity> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
+            List<ErpUnitsResponse> lists = thrCorpEntities.stream().map(
+                    item -> {
+                        ErpUnitsResponse thrProductsEntity = new ErpUnitsResponse();
+                        BeanUtils.copyProperties(item, thrProductsEntity);
+                        thrProductsEntity.setId(item.getUnitId());
+                        return thrProductsEntity;
+                    }
+            ).collect(Collectors.toList());
+            imports.addAll(lists);
         }
         if (imports != null && imports.size() > 0) {
             for (ErpUnitsResponse erpUnitsResponse : imports) {

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

@@ -37,22 +37,22 @@ public class CompanyProductsRelService {
                 boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
             }
 
-        } else {//一键导出
+        } else {//一键导出  //todo暂时去掉
-            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+//            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-            BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
+//            BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
-            filterUdiInfoRequest.setPage(null);
+//            filterUdiInfoRequest.setPage(null);
-            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
+//            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-            for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
+//            for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
-                CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
+//                CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
-                companyProductRelevanceEntity.setCreate_time(new Date());
+//                companyProductRelevanceEntity.setCreate_time(new Date());
-                companyProductRelevanceEntity.setUpdate_time(new Date());
+//                companyProductRelevanceEntity.setUpdate_time(new Date());
-                companyProductRelevanceEntity.setAuditStatus("3");
+//                companyProductRelevanceEntity.setAuditStatus("3");
-                companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
+//                companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
-                companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId());
+//                companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId());
-                companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid());
+//                companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid());
-                companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
+//                companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
-                boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
+//                boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
-            }
+//            }
         }
     }
 

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

@@ -231,11 +231,13 @@ public class InvProductsTrService {
                 } else {
                     count = warehouseEntity.getCount();
                 }
-                int invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId());
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(true, true);
+                int invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), invWarehouseEntity.getCode());
                 if (invCount <= 0) {
-                    invCount = getCountByOrder(null, code, warehouseEntity.getSupId());
+                    invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), invWarehouseEntity.getCode());
                 }
-
+                warehouseEntity.setFromCorpId(invWarehouseEntity.getCode());
+                warehouseEntity.setFromCorp(invWarehouseEntity.getName());
                 if (invCount > 0) {
                     if (count > invCount) {
                         int lea = count - invCount;
@@ -264,9 +266,27 @@ public class InvProductsTrService {
                 } else {
                     count = warehouseEntity.getCount();
                 }
-                int invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId());
+
-                if (invCount <= 0) {
+                //获取当前仓库
-                    invCount = getCountByOrder(null, code, warehouseEntity.getSupId());
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(warehouseEntity.getLocStorageCode());
+                int invCount = 0;
+                if (invWarehouseEntity.getPcode() != null || !invWarehouseEntity.getPcode().equals("0")) {
+                    //上级仓库
+                    warehouseEntity.setFromCorp(invWarehouseEntity.getName());
+                    warehouseEntity.setFromCorpId(invWarehouseEntity.getCode());
+                    invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), invWarehouseEntity.getPcode());
+                    if (invCount <= 0) {
+                        invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), invWarehouseEntity.getPcode());
+                    }
+                } else {
+                    //供应商
+                    warehouseEntity.setFromCorpId(warehouseEntity.getSupId());
+                    BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId());
+                    warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName());
+                    invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), null);
+                    if (invCount <= 0) {
+                        invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), null);
+                    }
                 }
                 if (invCount > 0) {
                     if (count > invCount) {
@@ -302,49 +322,47 @@ public class InvProductsTrService {
             List<WarehouseEntity> temps1 = filterMapCodes(preiInList);
             buildNorPreInOrder(advChangeTypeEntity, temps1, orderEntity);   //3.补寄售转入
         }
-
-
     }
 
 
-    public List<WarehouseEntity> addOutOrder(OrderEntity
+//    public List<WarehouseEntity> addOutOrder(OrderEntity
-                                                     orderEntity, List<InvProductDetailEntity> invProductDetailEntities) {
+//                                                     orderEntity, List<InvProductDetailEntity> invProductDetailEntities) {
-        List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
+//        List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
-        List<WarehouseEntity> inList = new ArrayList<>();
+//        List<WarehouseEntity> inList = new ArrayList<>();
-        for (WarehouseEntity warehouseEntity : warehouseEntities) {
+//        for (WarehouseEntity warehouseEntity : warehouseEntities) {
-            //获取普通出入库结余数量
+//            //获取普通出入库结余数量
-            int actCount = getActCount(warehouseEntity);
+//            int actCount = getActCount(warehouseEntity);
-            int count = 0;
+//            int count = 0;
-            UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
+//            UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
-            String code = warehouseEntity.getCode();
+//            String code = warehouseEntity.getCode();
-            if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
+//            if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
-                    || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
+//                    || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
-                warehouseEntity.setNameCode(udiInfoEntity.getNameCode());
+//                warehouseEntity.setNameCode(udiInfoEntity.getNameCode());
-                code = FilterUdiUtils.transGlxpNoSerStr(warehouseEntity);
+//                code = FilterUdiUtils.transGlxpNoSerStr(warehouseEntity);
-                count = actCount * warehouseEntity.getCount();
+//                count = actCount * warehouseEntity.getCount();
-            } else {
+//            } else {
-                count = warehouseEntity.getCount();
+//                count = warehouseEntity.getCount();
-            }
+//            }
-            int invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId());
+//            int invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId());
-            if (invCount <= 0) {
+//            if (invCount <= 0) {
-                invCount = getCountByOrder(null, code, warehouseEntity.getSupId());
+//                invCount = getCountByOrder(null, code, warehouseEntity.getSupId());
-            }
+//            }
-            if (invCount > 0) {
+//            if (invCount > 0) {
-                if (count > invCount) {
+//                if (count > invCount) {
-                    int lea = count - invCount;
+//                    int lea = count - invCount;
-                    warehouseEntity.setCount(lea / actCount);
+//                    warehouseEntity.setCount(lea / actCount);
-                    inList.add(warehouseEntity);
+//                    inList.add(warehouseEntity);
-                }
+//                }
-            } else {
+//            } else {
-                warehouseEntity.setCount(count);
+//                warehouseEntity.setCount(count);
-                inList.add(warehouseEntity);
+//                inList.add(warehouseEntity);
-            }
+//            }
-            InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode());
+//            InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode());
-            insetInvSingle(false, invProductDetailEntity);
+//            insetInvSingle(false, invProductDetailEntity);
-            warehouseEntity.setCode(code);
+//            warehouseEntity.setCode(code);
-        }
+//        }
-        return inList;
+//        return inList;
-    }
+//    }
 
     //普通入库补单
     public List<WarehouseEntity> addPutOrder(OrderEntity
@@ -573,6 +591,69 @@ public class InvProductsTrService {
         //采购入库生成单据
         Map<String, List<WarehouseEntity>> filterSupMaps = new HashMap<>();
         List<WarehouseEntity> unkonwCorpList = new ArrayList<>();
+        //根据库存，过滤供应商，条码分组
+        for (WarehouseEntity warehouseEntity : useInList) {
+            if (warehouseEntity.getFromCorpId() != null) {
+                if (filterSupMaps.get(warehouseEntity.getFromCorpId()) == null) {
+                    List<WarehouseEntity> temps = new ArrayList<>();
+                    temps.add(warehouseEntity);
+                    filterSupMaps.put(warehouseEntity.getFromCorpId(), temps);
+                } else {
+                    filterSupMaps.get(warehouseEntity.getFromCorpId()).add(warehouseEntity);
+                }
+            } else
+                unkonwCorpList.add(warehouseEntity);
+        }
+
+        //根据往来单位生成入库单
+        for (String corpName : filterSupMaps.keySet()) {
+            List<WarehouseEntity> temps;
+            temps = filterSupMaps.get(corpName);
+            OrderEntity outOrder = new OrderEntity();
+            BeanUtils.copyProperties(orderEntity, outOrder);
+            outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
+            outOrder.setAction(bussinessChangeTypeEntity.getScAction());
+            outOrder.setMainAction(ConstantType.TYPE_PUT);
+            outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
+            outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
+            outOrder.setErpFk(null);
+            outOrder.setFromType(ConstantStatus.FROM_CHANGE);
+            outOrder.setId(CustomUtil.getId());
+            outOrder.setFromCorpId(corpName);
+            outOrder.setFromCorp(temps.get(0).getFromCorp());
+            outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
+            if ("1".equals(systemParamConfigEntity.getParamValue())) {
+                outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+            } else {
+                outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);
+            }
+
+            orderService.insertOrder(outOrder);
+            for (WarehouseEntity warehouseEntity : temps) {
+                warehouseEntity.setOrderId(outOrder.getId());
+                warehouseEntity.setId(null);
+                warehouseEntity.setFromCorp(outOrder.getFromCorp());
+                warehouseEntity.setFromCorpId(outOrder.getFromCorpId());
+                warehouseEntity.setLocStorageCode(outOrder.getLocStorageCode());
+                warehouseEntity.setAction(bussinessChangeTypeEntity.getScAction());
+                warehouseEntity.setMainAction(ConstantType.TYPE_PUT);
+            }
+            codesTempService.insertCodesTemp(temps);
+        }
+
+
+    }
+
+    //生成普通入库单据
+    public void buildInOrder2(BussinessChangeTypeEntity
+                                      bussinessChangeTypeEntity, List<WarehouseEntity> useInList, OrderEntity orderEntity) {
+        if (useInList.size() <= 0) {
+            return;
+        }
+        //采购入库生成单据
+        Map<String, List<WarehouseEntity>> filterSupMaps = new HashMap<>();
+        List<WarehouseEntity> unkonwCorpList = new ArrayList<>();
 //        InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true);
         //根据库存，过滤供应商，条码分组
         for (WarehouseEntity warehouseEntity : useInList) {
@@ -663,7 +744,6 @@ public class InvProductsTrService {
 
     }
 
-
     //生成寄售转入单据
     public void buildNorPreInOrder(BussinessChangeTypeEntity
                                            bussinessChangeTypeEntity, List<WarehouseEntity> useInList, OrderEntity orderEntity) {
@@ -673,6 +753,75 @@ public class InvProductsTrService {
         //采购入库生成单据
         Map<String, List<WarehouseEntity>> filterSupMaps = new HashMap<>();
         List<WarehouseEntity> unkonwCorpList = new ArrayList<>();
+        //根据库存，过滤供应商，条码分组
+        for (WarehouseEntity warehouseEntity : useInList) {
+            if (warehouseEntity.getFromCorpId() != null) {
+                if (filterSupMaps.get(warehouseEntity.getFromCorpId()) == null) {
+                    List<WarehouseEntity> temps = new ArrayList<>();
+                    temps.add(warehouseEntity);
+                    filterSupMaps.put(warehouseEntity.getFromCorpId(), temps);
+                } else {
+                    filterSupMaps.get(warehouseEntity.getFromCorpId()).add(warehouseEntity);
+                }
+            } else
+                unkonwCorpList.add(warehouseEntity);
+        }
+
+        //有供应商生成采购入库单据
+        for (String corpName : filterSupMaps.keySet()) {
+            List<WarehouseEntity> temps;
+            temps = filterSupMaps.get(corpName);
+            OrderEntity outOrder = new OrderEntity();
+            BeanUtils.copyProperties(orderEntity, outOrder);
+            outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
+            outOrder.setAction(bussinessChangeTypeEntity.getScAction());
+            outOrder.setMainAction(ConstantType.TYPE_PUT);
+            outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
+            outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
+            outOrder.setFromCorp(temps.get(0).getFromCorp());
+            outOrder.setFromCorpId(temps.get(0).getFromCorpId());
+            outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+            outOrder.setErpFk(null);
+            outOrder.setFromType(ConstantStatus.FROM_CHANGE);
+            outOrder.setId(CustomUtil.getId());
+//            BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(corpName);
+//            outOrder.setFromCorp(basicUnitMaintainEntity.getName());
+//            outOrder.setFromCorpId(corpName);
+            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
+            if ("1".equals(systemParamConfigEntity.getParamValue())) {
+                outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+            } else {
+                outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);
+            }
+
+            orderService.insertOrder(outOrder);
+            for (WarehouseEntity warehouseEntity : temps) {
+                warehouseEntity.setOrderId(outOrder.getId());
+                warehouseEntity.setId(null);
+                warehouseEntity.setFromCorp(outOrder.getFromCorp());
+                warehouseEntity.setFromCorpId(outOrder.getFromCorpId());
+                warehouseEntity.setLocStorageCode(outOrder.getLocStorageCode());
+                warehouseEntity.setAction(bussinessChangeTypeEntity.getScAction());
+                warehouseEntity.setMainAction(ConstantType.TYPE_PUT);
+            }
+            codesTempService.insertCodesTemp(temps);
+//            ioTransInoutService.transInout(outOrder.getId());
+        }
+
+
+
+
+    }
+
+    //生成寄售转入单据
+    public void buildNorPreInOrder2(BussinessChangeTypeEntity
+                                            bussinessChangeTypeEntity, List<WarehouseEntity> useInList, OrderEntity orderEntity) {
+        if (useInList.size() <= 0) {
+            return;
+        }
+        //采购入库生成单据
+        Map<String, List<WarehouseEntity>> filterSupMaps = new HashMap<>();
+        List<WarehouseEntity> unkonwCorpList = new ArrayList<>();
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(true, true);
         //根据库存，过滤供应商，条码分组
         for (WarehouseEntity warehouseEntity : useInList) {
@@ -955,10 +1104,11 @@ public class InvProductsTrService {
 
 
     //根据条码获取库存结余数量
-    public int getCountByOrder(String mainAction, String code, String supId) {
+    public int getCountByOrder(String mainAction, String code, String supId, String invWarehouseCode) {
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
         filterInvProductDetailRequest.setCode(code);
         filterInvProductDetailRequest.setSupId(supId);
+        filterInvProductDetailRequest.setInvStorageCode(invWarehouseCode);
         if (mainAction != null)
             filterInvProductDetailRequest.setMainAction(mainAction);
         List<InvProductDetailJoinResponse> detailJoinResponseList

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

@@ -236,8 +236,7 @@ public class IoTransInoutService {
                 orderEntity.setFromType(ConstantStatus.FROM_UDIMS);
                 orderEntity.setReceiveStatus(0);
                 orderEntity.setId(orderId);
-                orderEntity.setAction(ConstantType.TYPE_PUT);
+                orderEntity.setMainAction(ConstantType.TYPE_PUT);
-                orderEntity.setAction("SC54593439742");
                 orderEntity.setActDate(DateUtil.getDate());
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                 orderEntity.setExportStatus(ConstantStatus.ORDER_EXPORT_UN);
@@ -251,6 +250,8 @@ public class IoTransInoutService {
                     BeanUtils.copyProperties(codeBean, warehouseEntity);
                     warehouseEntity.setFromCorp(companyEntity.getCompanyName());
                     warehouseEntity.setFromCorpId(companyEntity.getUnitIdFk());
+                    warehouseEntity.setMainAction(orderEntity.getMainAction());
+                    warehouseEntity.setAction(orderEntity.getAction());
                     InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true);
                     warehouseEntity.setLocStorageCode(invWarehouseEntity.getCode());
                     warehouseEntity.setOrderId(orderId);
@@ -291,6 +292,9 @@ public class IoTransInoutService {
 
     public void transInout(OrderEntity orderEntity) {
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
+        if (bussinessTypeEntity == null) {
+            return;
+        }
         if (orderEntity.getFromCorp() == null) {
             orderEntity.setRemark("未选择往来单位");
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
@@ -358,24 +362,28 @@ public class IoTransInoutService {
                 return;
             }
 
-            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
+            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode());
-            if (udiRelevanceResponse == null) {
+            if (udiRelevanceResponses.size() == 1) {
-                orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
+                UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
-                orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品信息未维护！");
+                if (udiRelevanceResponse == null) {
-                return;
+                    orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
-            } else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
+                    orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品信息未维护！");
-                orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
+                    return;
-                orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库！");
+                } else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
-                return;
-            }
-            if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
-                CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(udiRelevanceResponse.getId() + "", warehouseEntity.getFromCorpId());
-                if (companyProductRelevanceEntity == null) {
                     orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
-                    orderService.updateRemark(orderEntity.getId(), udiRelevanceResponse.getCpmctymc() + "该产品非此供应商配送");
+                    orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库！");
                     return;
                 }
+                if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
+                    CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(udiRelevanceResponse.getId() + "", warehouseEntity.getFromCorpId());
+                    if (companyProductRelevanceEntity == null) {
+                        orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
+                        orderService.updateRemark(orderEntity.getId(), udiRelevanceResponse.getCpmctymc() + "该产品非此供应商配送");
+                        return;
+                    }
+                }
             }
+
         }
 
         if (insertList.size() > 0) {
@@ -407,17 +415,24 @@ public class IoTransInoutService {
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
             filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode());
             List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-            if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {
+
+            //默认或已选中供应商
+            String originSupId = checkOriginExitSup(warehouseEntity);
+            if (originSupId != null) {
+                warehouseEntity.setSupId(originSupId);
+            }
+
+
+            if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
                 warehouseEntity.setRelId(null);
                 warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
-            } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {
+            } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现
                 warehouseEntity.setRelId(null);
                 warehouseEntity.setStatus(2);
             } else {
                 warehouseEntity.setStatus(0);
                 if (warehouseEntity.getRelId() == null)
                     warehouseEntity.setRelId(udiRelevanceEntities.get(0).getId() + "");
-                String originSupId = checkOriginExitSup(warehouseEntity);
                 if (originSupId == null) {
                     if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
                         String supId = null;
@@ -840,7 +855,7 @@ public class IoTransInoutService {
     public StockOrderEntity genStockOrder(OrderEntity orderEntity, BussinessTypeEntity bussinessTypeEntity) {
         //生成业务单据记录
         StockOrderEntity stockOrderEntity = new StockOrderEntity();
-        stockOrderEntity.setBillNo(orderEntity.getId());
+        stockOrderEntity.setBillNo("ST" + CustomUtil.getId());
         stockOrderEntity.setBillType(bussinessTypeEntity.getLocalAction());//todo
         stockOrderEntity.setBilldate(orderEntity.getActDate());
         stockOrderEntity.setCustomerId(orderEntity.getCustomerId());

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

@@ -130,7 +130,8 @@ public class HttpClient {
         RestTemplate restTemplate = new RestTemplate();
         String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list";
         logger.info(accessTokenRequestUrl);
-        String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, new HttpEntity<String>(headers));
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>( headers);
+        String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, httpEntity);
         return response;
     }
 }

api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml

@@ -8,7 +8,7 @@
         where id = #{id}
     </select>
     <insert id="save" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthLicense">
-        INSERT INTO auth_license(id, appid, name, api_key, secret_key, create_date, customerId, companyName)
+        INSERT INTO auth_license(id, appid, name, apiKey, secretKey, createDate, customerId, companyName)
         values (#{id}, #{appid}, #{name,jdbcType=VARCHAR}, #{apiKey,jdbcType=VARCHAR},
                 #{secretKey,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{customerId}, #{companyName})
     </insert>
@@ -32,4 +32,10 @@
         from auth_license
         where id = #{id}
     </delete>
+
+    <delete id="romveByCustomerId">
+        delete
+        from auth_license
+        where customerId = #{customerId}
+    </delete>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml

@@ -25,6 +25,12 @@
             <if test="isDefault != null">
                 AND isDefault = #{isDefault}
             </if>
+            <if test="pcode != null">
+                AND pcode = #{pcode}
+            </if>
+            <if test="level != null">
+                AND level = #{level}
+            </if>
         </where>
 
     </select>
@@ -37,9 +43,41 @@
 
     </select>
 
+    <select id="selectMaxCode" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
+            resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
+        select max(code) as code from inv_warehouse
+        <where>
+            <if test="id != '' and id != null">
+                AND id = #{id}
+            </if>
+            <if test="pid != '' and pid != null">
+                AND pid = #{pid}
+            </if>
+            <if test="code != '' and code != null">
+                AND code = #{code}
+            </if>
+            <if test="name != '' and name != null">
+                AND name = #{name}
+            </if>
+            <if test=" advanceType != null">
+                AND advanceType = #{advanceType}
+            </if>
+            <if test="isDefault != null">
+                AND isDefault = #{isDefault}
+            </if>
+            <if test="pcode != null">
+                AND pcode = #{pcode}
+            </if>
+            <if test="level != null">
+                AND level = #{level}
+            </if>
+        </where>
+
+    </select>
+
 
     <select id="filterGroupInvWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
-            resultType="com.glxp.sale.admin.res.inventory.InvProductResponse">
+            resultType="com.glxp.sale.admin.res.inventory.InvWarehouseResponse">
         SELECT * FROM inv_warehouse
         <where>
             <if test="id != '' and id != null">
@@ -73,7 +111,7 @@
         replace
         INTO inv_warehouse
         (pid, code, name, advanceType, isDefault,
-         status, updateTime, remark)
+         status, updateTime, remark,level,pcode)
         values (
         #{pid},
         #{code},
@@ -82,7 +120,9 @@
         #{isDefault},
         #{status},
         #{updateTime},
-        #{remark}
+        #{remark},
+        #{level},
+        #{pcode}
         )
     </insert>
 
@@ -104,22 +144,25 @@
             <if test="status != null">status=#{status},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="remark != null">remark=#{remark},</if>
+            <if test="level != null">level=#{level},</if>
+            <if test="pcode != null">pcode=#{pcode},</if>
         </trim>
         WHERE id = #{id}
     </update>
 
     <insert id="importInvWarehouse" parameterType="java.util.List">
-        replace into inv_warehouse (id, pId, code, name, advanceType, isDefault, status, updateTime, remark) values
+        replace into inv_warehouse (id, pId, code, name, advanceType, isDefault, status,
+        updateTime, remark,level,pcode) values
         <foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
             (#{item.id},
-             #{item.pid},
+            #{item.pid},
-             #{item.code},
+            #{item.code},
-             #{item.name},
+            #{item.name},
-             #{item.advanceType},
+            #{item.advanceType},
-             #{item.isDefault},
+            #{item.isDefault},
-             #{item.status},
+            #{item.status},
-             #{item.updateTime},
+            #{item.updateTime},
-             #{item.remark})
+            #{item.remark}, #{item.level}, #{item.pcode})
         </foreach>
     </insert>
 </mapper>