diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java index bc3d1aa..76a03c0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java @@ -5,6 +5,7 @@ import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.AuthRole; import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; +import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; import com.glxp.sale.admin.req.auth.AuthAdminSaveRequest; @@ -14,6 +15,7 @@ import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.AuthRoleAdminService; import com.glxp.sale.admin.service.auth.AuthRoleService; +import com.glxp.sale.admin.service.auth.CustomerInfoService; import com.glxp.sale.admin.util.PasswordUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -47,6 +49,8 @@ public class AuthAdminController { @Resource private AuthRoleAdminService authRoleAdminService; + @Resource + private CustomerInfoService customerInfoService; /** * 获取管理员列表 @@ -223,6 +227,13 @@ public class AuthAdminController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } AuthAdmin curUser = getCustomerId(); + + CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId()); + int max = customerInfoEntity.getUserMax(); + int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId()); + if (count >= max) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数"); + } // 检查是否存在相同名称的管理员 AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName()); if (byUserName != null) { @@ -345,6 +356,7 @@ public class AuthAdminController { /** * 获取医院用户列表 + * * @return */ @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index 606a82c..c6cb704 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java @@ -78,10 +78,20 @@ public class LoginController { if (authAdmin.getUserFlag() == 0) { throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！"); } + if (authAdmin.getUserFlag() == 2) { + throw new JsonException(ResultEnum.DATA_NOT, "该用户未验证！"); + } CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(authAdmin.getCustomerId()); if (customerInfoEntity.getUserFlag() == 0) { throw new JsonException(ResultEnum.DATA_NOT, "该企业账户已被禁用！"); } + }else{ + if (authAdmin.getUserFlag() == 0) { + throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！"); + } + if (authAdmin.getUserFlag() == 2) { + throw new JsonException(ResultEnum.DATA_NOT, "该用户未验证！"); + } } } if (authAdmin == null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java index 8d03f5f..1810153 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java @@ -77,6 +77,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicUnitMaintainEntities; +// basicUnitMaintainFilterRequest.setCorpType(ConstantStatus.CORP_SP); basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index 888d181..49782e0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -16,6 +16,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BussinessChangeTypeService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; @@ -51,6 +52,8 @@ public class BussinessLocalTypeController { private BussinessTypeService bussinessTypeService; @Resource private StockOrderService stockOrderService; + @Resource + CustomerService customerService; @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filterJoin") @@ -86,10 +89,12 @@ public class BussinessLocalTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String customerId = getCustomerId(); + if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { bussinessTypeFilterRequest.setSpUse(true); + } else { + bussinessTypeFilterRequest.setUserId(customerService.getUserId()); } - List bussinessTypeEntities; bussinessTypeEntities = bussinessLocalTypeService.filterJoinByUser( bussinessTypeFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 04a79d1..ba18d2f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -92,20 +92,17 @@ public class OrderController { public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { // orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL); // orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); - if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { - orderFilterRequest.setCustomerId(null); + if (companyEntity.getUnitIdFk().equals("110")) { + orderFilterRequest.setFromCorpId(null); orderFilterRequest.setUserId(customerService.getUserId()); } 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()); - } + orderFilterRequest.setCustomerId(null); + orderFilterRequest.setFromCorpId(companyEntity.getUnitIdFk()); } + orderFilterRequest.setCustomerId(null); // List orderEntityList = orderService.filterListOr(orderFilterRequest); List orderEntityList = orderService.filterList(orderFilterRequest); @@ -170,14 +167,15 @@ public class OrderController { BindingResult bindingResult) { if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); - if (companyEntity.getUnitIdFk().equals("110")) { - orderFilterRequest.setFromCorpId(null); - orderFilterRequest.setUserId(customerService.getUserId()); - } else { - orderFilterRequest.setCustomerId(null); - orderFilterRequest.setFromCorpId(companyEntity.getUnitIdFk()); - } + CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); + if (companyEntity.getUnitIdFk().equals("110")) { + orderFilterRequest.setFromCorpId(null); + orderFilterRequest.setUserId(customerService.getUserId()); + } else { + orderFilterRequest.setCustomerId(null); + orderFilterRequest.setFromCorpId(companyEntity.getUnitIdFk()); + } + orderFilterRequest.setCustomerId(null); if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -223,7 +221,7 @@ public class OrderController { List orderEntityList; if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) { orderFilterRequest.setStatus(4); - orderFilterRequest.setContrastStatus(2); +// orderFilterRequest.setContrastStatus(2); // orderFilterRequest.setReceiveStatus(0); // orderFilterRequest.setStatusOrOne(3); } @@ -265,6 +263,18 @@ public class OrderController { stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); stockOrderService.updateById(stockOrderEntity); + } + } else { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setOrderIdFk(updateExportStatusRequest.getOrderId()); + List stockOrderEntityLit = stockOrderService.findAllOrders(stockOrderFilterRequest); + if (!stockOrderEntityLit.isEmpty()) { + for (StockOrderEntity stockOrderEntity : stockOrderEntityLit) { + stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); + stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); + stockOrderService.updateById(stockOrderEntity); + } + } } invProductsTrService.genInvProducts(orderEntity.getId()); @@ -446,8 +456,6 @@ public class OrderController { } else { return ResultVOUtils.error(500, "当前单据已补单，请勿重复补单"); } - - } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java index 8bb45e4..2e938cc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java @@ -365,10 +365,10 @@ public class StockQRCodeTextController { List list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); if (list != null && list.size() > 0) { int index = 1; - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(list.get(0).getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(Constant.SYSTEM_CUSTOMER_ID));//Long.parseLong(list.get(0).getCustomerId()) for (StockOrderPrintEntity stockOrderPrintEntity : list) { stockOrderPrintEntity.setIndex(index + ""); - stockOrderPrintEntity.setTitle(stockOrderPrintEntity.getCorpName()); + stockOrderPrintEntity.setTitle(companyEntity.getCompanyName()); // StockOrderPrintResponse stockOrderPrintResponse = new StockOrderPrintResponse(); // BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse); // stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice()); @@ -376,7 +376,7 @@ public class StockQRCodeTextController { // stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36)); // stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88)); // stockOrderPrintEntity.setTotalPriceWord("18888"); - stockOrderPrintEntity.setCorpName(companyEntity.getCompanyName()); + stockOrderPrintEntity.setCorpName(stockOrderPrintEntity.getCorpName()); stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName()); index++; // stockOrderPrintResponses.add(stockOrderPrintResponse); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index b99d335..35e8582 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -8,6 +8,7 @@ import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; @@ -22,10 +23,12 @@ import com.glxp.sale.admin.res.inventory.InvProductDetailResponse; import com.glxp.sale.admin.res.inventory.InvProductPageRespnonse; import com.glxp.sale.admin.res.inventory.InvProductResponse; import com.glxp.sale.admin.res.inventory.InvProductStatResponse; +import com.glxp.sale.admin.service.auth.CustomerService; 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.OrderService; +import com.glxp.sale.admin.service.inout.WarehouseUserService; import com.glxp.sale.admin.service.inventory.InvProductDetailService; import com.glxp.sale.admin.service.inventory.InvProductService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; @@ -65,6 +68,10 @@ public class InvProductsController { private CompanyService companyService; @Resource private InvWarehouseService invWarehouseService; + @Resource + private WarehouseUserService warehouseUserService; + @Resource + CustomerService customerService; @AuthRuleAnnotation("") @GetMapping("spms/inv/products/filter") @@ -73,6 +80,18 @@ public class InvProductsController { if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { filterInvProductRequest.setCustomerId(null); showSup = true; + if (StrUtil.isEmpty(filterInvProductRequest.getInvStorageCode() )) { + List warehouseUserEntities = warehouseUserService.selectCodeByUser(customerService.getUserId() + ""); + if (!warehouseUserEntities.isEmpty()) { + List invCodes = new ArrayList<>(); + warehouseUserEntities.forEach(warehouseUserEntity -> { + invCodes.add(warehouseUserEntity.getCode()); + }); + filterInvProductRequest.setInvCodes(invCodes); + } + + + } } else { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId())); filterInvProductRequest.setSupId(companyEntity.getUnitIdFk()); @@ -81,6 +100,8 @@ public class InvProductsController { filterInvProductRequest.setCustomerId(null); } // filterInvProductRequest.setGroupType("invStorageCode"); + + List invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(invProductResponses); @@ -97,7 +118,7 @@ public class InvProductsController { if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { filterInvProductRequest.setCustomerId(null); } - filterInvProductRequest.setSupId(null); +// filterInvProductRequest.setSupId(null); List invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(invProductDetailEntities); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index 87b1867..14efb6a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -8,9 +8,14 @@ import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; +import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; +import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.sale.admin.req.basic.BasicExportStatusRequest; +import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; @@ -20,7 +25,11 @@ import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BasicExportService; +import com.glxp.sale.admin.service.basic.BussinessTypeService; +import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; +import com.glxp.sale.admin.service.inventory.InvProductDetailService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; +import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrInvWarehouseService; import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.FileUtils; @@ -51,13 +60,20 @@ public class InvWarehouseController { CustomerService customerService; @Resource BasicExportService basicExportService; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + InvProductDetailService invProductDetailService; + @Resource + BussinessTypeService bussinessTypeService; + @Resource + WarehouseBussinessTypeService warehouseBussinessTypeService; @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filter") public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); List merge = merge(invWarehouseEntities, 0); - Map restMap = new HashMap<>(); restMap.put("list", merge); return ResultVOUtils.success(restMap); @@ -71,6 +87,35 @@ public class InvWarehouseController { return ResultVOUtils.success(invWarehouseEntities); } + + @AuthRuleAnnotation("") + @GetMapping("spms/inv/warehouse/filterAllLocInv") + public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { + filterInvWarehouseRequest.setPid(0); + List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); + List temps = new ArrayList<>(); + if (systemParamConfigEntity.getParamValue().equals("1")) { + for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { + if (!invWarehouseEntity.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) { + temps.add(invWarehouseEntity); + } + } + return ResultVOUtils.success(temps); + } else { + InvWarehouseEntity curEntity = invWarehouseService.selectByCode(filterInvWarehouseRequest.getLocInvCode()); + for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { + if (!StrUtil.isEmpty(curEntity.getPcode()) && curEntity.getPcode().equals(invWarehouseEntity.getCode())) { + temps.add(invWarehouseEntity); + } else if (!StrUtil.isEmpty(invWarehouseEntity.getPcode()) && invWarehouseEntity.getPcode().equals(curEntity.getCode())) { + temps.add(invWarehouseEntity); + } + } + return ResultVOUtils.success(temps); + } + } + + @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAllByUser") public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { @@ -169,6 +214,26 @@ public class InvWarehouseController { if (deleteRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectById(deleteRequest.getId()); + InvProductDetailEntity invProductDetailEntity = invProductDetailService.isExit(invWarehouseEntity.getCode()); + if (invProductDetailEntity != null) { + return ResultVOUtils.error(500, "该仓库已有库存，不能删除！"); + } + + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setCode(invWarehouseEntity.getCode()); + List warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); + if (!warehouseEntities.isEmpty()) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + } + + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invWarehouseEntity.getCode()); + if (!warehouseBussinessTypeEntities.isEmpty()) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + } + + boolean b = invWarehouseService.deleteById(deleteRequest.getId()); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -176,6 +241,36 @@ public class InvWarehouseController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") + @PostMapping("/spms/inv/warehouse/disable") + public BaseResponse disable(@RequestBody InvWarehouseEntity request) { + + if (request.getCode() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(request.getCode()); +// InvProductDetailEntity invProductDetailEntity = invProductDetailService.isExit(invWarehouseEntity.getCode()); +// if (invProductDetailEntity != null) { +// return ResultVOUtils.error(500, "该仓库已有库存，不能删除！"); +// } + + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setCode(invWarehouseEntity.getCode()); + List warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); + if (!warehouseEntities.isEmpty()) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + } + + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invWarehouseEntity.getCode()); + if (!warehouseBussinessTypeEntities.isEmpty()) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + } + + + return ResultVOUtils.success(); + } + //仓库信息文件导出 @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java index 1d32a32..f31ca41 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java @@ -41,6 +41,8 @@ public interface AuthAdminDao { */ AuthAdmin findByUserName(String userName); + int findCountByCustomerId(Long id); + AuthAdmin findByUser(@Param("userName") String userName, @Param("CustomerId") String CustomerId); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java index c9a5917..2d9d51d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java @@ -30,6 +30,8 @@ public interface WarehouseUserDao { List selectListByCode(@Param("code") String code); + List selectCodeByUser(@Param("userId") String userId); + void deleteByCode(@Param("code") String code); /** diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvProductDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvProductDetailDao.java index 7101b29..e864bcf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvProductDetailDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvProductDetailDao.java @@ -26,4 +26,8 @@ public interface InvProductDetailDao { boolean deleteByProductId(FilterInvProductDetailRequest productIdFk); int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest); + + + InvProductDetailEntity isExit(FilterInvProductDetailRequest filterInvProductDetailRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java index 5fbe498..eccd94d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java @@ -16,6 +16,7 @@ public interface ThrProductsDao { List batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest); ThrProductsEntity selectById(@Param("id") String id); + List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); boolean insertThrProducts(ThrProductsEntity thrProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java index d67ff1a..21f4e89 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java @@ -19,7 +19,7 @@ public class BussinessTypeEntity { private boolean innerOrder; private boolean secCheckEnable; private Boolean spUse; - + private String defaultUnit; private Integer index; private boolean checkUdims; private boolean checkPdaEd; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java index 30668f8..2890392 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java @@ -15,5 +15,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest { private Boolean spUse; private Boolean isFilter; private String code; + private Integer userId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java index 975637e..0e27822 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java @@ -18,5 +18,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private Boolean secCheckEnable; private Integer userId; private String filterAction; + private String locInvCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java index ed32d8a..9f7abb6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java @@ -3,6 +3,8 @@ package com.glxp.sale.admin.req.inventory; import com.glxp.sale.admin.req.ListPageRequest; import lombok.Data; +import java.util.List; + @Data public class FilterInvProductRequest extends ListPageRequest { @@ -32,4 +34,6 @@ public class FilterInvProductRequest extends ListPageRequest { //货位码 private String invWarehouseCode; private String groupType; + + private List invCodes; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java index bcd87ac..34a33f1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java @@ -19,5 +19,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private Integer level; private String pcode; private Integer userId; + private String locInvCode; + private Integer status; private List ids; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java index 9d87c47..c29b295 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java @@ -20,6 +20,7 @@ public class BussinessTypResponse { private Boolean advanceType; //是否预入库 private Boolean changeEnable; private Boolean genUnit; + private String defaultUnit; // private Boolean innerOrder; private Boolean spUse; private String localName; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java index dbd94d2..b62b10e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java @@ -12,6 +12,8 @@ public interface AuthAdminService { AuthAdmin findByUserName(String userName); + int findCountByCustomerId(Long id); + AuthAdmin findByUser(String userName, String CustomerId); AuthAdmin findById(Long id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java index 82945bc..9745f80 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java @@ -36,6 +36,11 @@ public class AuthAdminServiceImpl implements AuthAdminService { return authAdminDao.findByUserName(userName); } + @Override + public int findCountByCustomerId(Long id) { + return authAdminDao.findCountByCustomerId(id); + } + @Override public AuthAdmin findByUser(String userName, String CustomerId) { return authAdminDao.findByUser(userName, CustomerId); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java index 8c5a2bc..85342fe 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.inout; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,6 +16,9 @@ public interface WarehouseUserService { */ List getListByCode(String code); + List selectCodeByUser( String userId); + + /** * 新增仓库字典，用户关联数据 * diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 27f0c2a..ff6d585 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -12,11 +12,14 @@ import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.req.inout.OrderQueryRequest; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.service.inout.OrderService; +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.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -46,6 +49,8 @@ public class OrderServiceImpl implements OrderService { CodesDao codesDao; @Resource CodesTempDao codesTempDao; + @Resource + SystemParamConfigService systemParamConfigService; @Override public List listOrders(OrderQueryRequest orderQueryRequest) { @@ -203,8 +208,16 @@ public class OrderServiceImpl implements OrderService { String supplementOrderNo = "SM" + CustomUtil.getId(); supplementOrder.setSupplementNo(order.getId()); supplementOrder.setId(supplementOrderNo); + + //修改状态 - supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); + if ("1".equals(systemParamConfigEntity.getParamValue())) { + supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); //设置状态为补录单据 + } else { + supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 + } + supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 @@ -220,6 +233,9 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setMainAction(supplementType.getMainAction()); supplementOrder.setAction(supplementType.getAction()); +// String time = DateUtil.getBeforeMinute(supplementOrder.getActDate(), 5); +// supplementOrder.setActDate(time); + //复制码表 List codes = codesDao.findByReceiptId(order.getId()); List supplementCodes = new ArrayList<>(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java index 6203b1f..e126b90 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -30,6 +30,12 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { return warehouseUserEntities; } + @Override + public List selectCodeByUser(String userId) { + return warehouseUserDao.selectCodeByUser(userId); + } + + @Override public void saveWarehouseUser(String code, List userList) { if (CollUtil.isNotEmpty(userList)) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvProductDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvProductDetailService.java index 265f970..17d7abd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvProductDetailService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvProductDetailService.java @@ -16,6 +16,9 @@ public interface InvProductDetailService { List filterJoinInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest); + + InvProductDetailEntity isExit(String locInvCode); + boolean insertInvProduct(InvProductDetailEntity invProductDetailEntity); boolean insertInvProducts(List invProductDetailEntitys); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductDetailServiceImpl.java index f6aa540..c252194 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductDetailServiceImpl.java @@ -53,6 +53,13 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { return data; } + @Override + public InvProductDetailEntity isExit(String locInvCode) { + FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); + filterInvProductDetailRequest.setInvStorageCode(locInvCode); + return invProductDetailDao.isExit(filterInvProductDetailRequest); + } + @Override public boolean insertInvProduct(InvProductDetailEntity invProductDetailEntity) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java index 6924648..33f57fa 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java @@ -74,7 +74,7 @@ public class ThrDataService { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); filterThrProductsRequest.setCode(code); filterThrProductsRequest.setThirdSysFk(thirdSys); - List thrProductsEntitys = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + List thrProductsEntitys = thrProductsService.selectThrProducts(filterThrProductsRequest); if (thrProductsEntitys != null && thrProductsEntitys.size() > 0) { return thrProductsEntitys.get(0); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java index a320343..9e3a5ef 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java @@ -11,6 +11,8 @@ public interface ThrProductsService { List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); + List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); + ThrProductsEntity selectById(String id); boolean insertThrProducts(ThrProductsEntity thrProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java index 1365323..0251283 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -32,6 +32,19 @@ public class ThrProductsServiceImpl implements ThrProductsService { return data; } + @Override + public List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest) { + if (filterThrProductsRequest == null) { + return Collections.emptyList(); + } + if (filterThrProductsRequest.getPage() != null) { + int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit()); + } + List data = thrProductsDao.selectThrProducts(filterThrProductsRequest); + return data; + } + @Override public ThrProductsEntity selectById(String id) { return thrProductsDao.selectById(id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java index ad973b2..57c67ac 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java @@ -132,7 +132,7 @@ public class BasicUpdateProductService { udiRelevanceEntity1.setThirdId(inventoryCode); FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); filterThrProductsRequest.setCode(inventoryCode); - List thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + List thrProductsEntities = thrProductsService.selectThrProducts(filterThrProductsRequest); if (thrProductsEntities != null && thrProductsEntities.size() > 0) { ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0); ErpProductsResponse erpProductsResponse = new ErpProductsResponse(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index 921d4b0..36623fb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -262,7 +262,7 @@ public class InvProductsTrService { invWarehouseEntity = invWarehouseService.findDefault(true, true); - int invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode()); + int invCount = getCountByOrder(null, warehouseEntity); warehouseEntity.setFromCorpId(invWarehouseEntity.getCode()); warehouseEntity.setFromCorp(invWarehouseEntity.getName()); if (invCount > 0) {//仓库已存在该产品 @@ -272,12 +272,12 @@ public class InvProductsTrService { preiInList.add(warehouseEntity); } else if (udiEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 int lea = count - invCount; - warehouseEntity.setCount(lea / (getActCount(warehouseEntity))); // + warehouseEntity.setCount(lea / (warehouseEntity.getCount())); // preiInList.add(warehouseEntity); } } } else { //结余数量《=0直接补 - warehouseEntity.setCount(count); +// warehouseEntity.setCount(count); preiInList.add(warehouseEntity); } InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode()); @@ -307,7 +307,7 @@ public class InvProductsTrService { warehouseEntity.setFromCorp(pInWarehouseEntity.getName()); warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode()); - invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode()); + invCount = getCountByOrder(null, warehouseEntity); // invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), locWarehouseEntity.getPcode()); // if (invCount <= 0) { // invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), locWarehouseEntity.getPcode()); @@ -321,7 +321,7 @@ public class InvProductsTrService { warehouseEntity.setFromCorpId(warehouseEntity.getSupId()); BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName()); - invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode()); + invCount = getCountByOrder(null, warehouseEntity); // invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), null); // if (invCount <= 0) { @@ -337,12 +337,12 @@ public class InvProductsTrService { inList.add(warehouseEntity); } else if (udiEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 int lea = count - invCount; - warehouseEntity.setCount(lea / (getActCount(warehouseEntity))); // + warehouseEntity.setCount(lea / (warehouseEntity.getCount())); // inList.add(warehouseEntity); } } } else { //结余数量《=0直接补 - warehouseEntity.setCount(count); +// warehouseEntity.setCount(count); inList.add(warehouseEntity); } // if (invCount > 0) { @@ -457,12 +457,12 @@ public class InvProductsTrService { prePutList.add(warehouseEntity); } else if (udiEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 int lea = count - invCount; - warehouseEntity.setCount(lea / (getActCount(warehouseEntity))); // + warehouseEntity.setCount(lea / (warehouseEntity.getCount())); // prePutList.add(warehouseEntity); } } } else { //结余数量《=0直接补 - warehouseEntity.setCount(count); +// warehouseEntity.setCount(count); prePutList.add(warehouseEntity); } InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode()); @@ -984,7 +984,7 @@ public class InvProductsTrService { invProductEntity.setProductsName(erpOrderEntity.getCoName()); invProductEntity.setYlqxzcrbarmc(erpOrderEntity.getProductCompany()); invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode()); - invProductEntity.setInvStorageCode(warehouseEntity.getInvStorageCode()); + invProductEntity.setInvStorageCode(warehouseEntity.getLocStorageCode()); invProductEntity.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode()); int count = getActCount(warehouseEntity) * warehouseEntity.getCount(); if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { @@ -1026,7 +1026,7 @@ public class InvProductsTrService { invProductDetailEntity.setExpireDate(warehouseEntity.getExpireDate()); invProductDetailEntity.setAction(warehouseEntity.getAction()); invProductDetailEntity.setMainAction(orderEntity.getMainAction()); - invProductDetailEntity.setInvStorageCode(warehouseEntity.getInvStorageCode()); + invProductDetailEntity.setInvStorageCode(warehouseEntity.getLocStorageCode()); invProductDetailEntity.setInvWarehouseCode(warehouseEntity.getWarehouseCode()); invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId()); invProductDetailEntity.setCount(actCount * warehouseEntity.getCount()); @@ -1096,9 +1096,10 @@ public class InvProductsTrService { } public int getActCount(WarehouseEntity warehouseEntity) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId()); UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode()); if (udiInfoBean != null) { - if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) { + if ((udiRelevanceEntity.getIsUseDy()!=null && udiRelevanceEntity.getIsUseDy()) && udiInfoBean.getDiType() != 2) { if (udiInfoBean.getBhzxxsbzsl() == 0) return udiInfoBean.getZxxsbzbhsydysl(); else @@ -1155,6 +1156,10 @@ public class InvProductsTrService { return null; } + public UdiInfoEntity getUdiInfo(WarehouseEntity warehouseEntity) { + UdiInfoEntity udiInfoBean = udiInfoService.findByNameCode(warehouseEntity.getNameCode()); + return udiInfoBean; + } //根据条码获取库存结余数量 public int getCountByOrder(String mainAction, String code, String supId, String invWarehouseCode) { @@ -1180,12 +1185,21 @@ public class InvProductsTrService { return invCount; } - public int getCountByOrder(String mainAction, String relId, String batchNo, String supId, String invWarehouseCode) { + public int getCountByOrder(String mainAction, WarehouseEntity warehouseEntity) { FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); - filterInvProductDetailRequest.setSupId(supId); - filterInvProductDetailRequest.setInvStorageCode(invWarehouseCode); - filterInvProductDetailRequest.setProductIdFk(relId); - filterInvProductDetailRequest.setBatchNo(batchNo); + UdiInfoEntity udiRelevanceResponse = getUdiInfo(warehouseEntity); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId()); + + //是否严格按照UDI码出入库，是： + // todo + if (warehouseEntity.getSerialNo() != null && udiRelevanceResponse.getDiType() == 1 && (udiRelevanceEntity.getIsUseDy()==null || !udiRelevanceEntity.getIsUseDy())) { + filterInvProductDetailRequest.setCode(warehouseEntity.getCode()); + } else { + filterInvProductDetailRequest.setProductIdFk(warehouseEntity.getRelId()); + filterInvProductDetailRequest.setBatchNo(warehouseEntity.getBatchNo()); + } + filterInvProductDetailRequest.setSupId(warehouseEntity.getSupId()); + filterInvProductDetailRequest.setInvStorageCode(warehouseEntity.getLocStorageCode()); if (mainAction != null) filterInvProductDetailRequest.setMainAction(mainAction); List resultLists = invProductDetailService.filterInvProduct(filterInvProductDetailRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 83fc11c..301af76 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -24,6 +24,7 @@ import com.glxp.sale.admin.httpclient.ErpOrderClient; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest; import com.glxp.sale.admin.req.inout.*; +import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; import com.glxp.sale.admin.service.basic.BussinessTypeService; @@ -475,9 +476,9 @@ public class IoTransInoutService { if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { String supId = null; if (originSupId == null) { - supId = checkExitSup(warehouseEntity.getRelId()); + supId = checkInvExitSup(warehouseEntity); if (supId == null) { - supId = checkInvExitSup(warehouseEntity); + supId = checkExitSup(warehouseEntity.getRelId()); } } else supId = originSupId; @@ -485,9 +486,9 @@ public class IoTransInoutService { warehouseEntity.setSupId(supId); } } else { - String supId = checkExitSup(warehouseEntity.getRelId()); + String supId = checkInvExitSup(warehouseEntity); if (supId == null) { - supId = checkInvExitSup(warehouseEntity); + supId = checkExitSup(warehouseEntity.getRelId()); } warehouseEntity.setSupId(supId); } @@ -610,7 +611,12 @@ public class IoTransInoutService { } public String checkInvExitSup(WarehouseEntity warehouseEntity) { - List invProductDetailEntities = invProductDetailService.findByCode(warehouseEntity.getCode()); + + FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); + filterInvProductDetailRequest.setProductIdFk(warehouseEntity.getRelId()); + filterInvProductDetailRequest.setBatchNo(warehouseEntity.getBatchNo()); + filterInvProductDetailRequest.setInvStorageCode(warehouseEntity.getLocStorageCode()); + List invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductDetailRequest); if (invProductDetailEntities.size() > 0) { return invProductDetailEntities.get(0).getSupId(); } @@ -643,7 +649,7 @@ public class IoTransInoutService { checkStatus = ConstantStatus.ORDER_CHECK_FAIL; } else { - if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && (erpOrderEntity.getSupId() == null || erpOrderEntity.getSupId().equals("MUTI"))) { + if ((erpOrderEntity.getSupId() == null || erpOrderEntity.getSupId().equals("MUTI"))) { if (erpOrderEntity.getSupId() == null) { erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_NONE); orderEntity.setRemark("该产品未指定供应商"); @@ -653,17 +659,10 @@ public class IoTransInoutService { } checkStatus = ConstantStatus.ORDER_CHECK_FAIL; } else { - 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; - } else { - orderEntity.setContrastStatus(checkStatus); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); - orderService.updateOrder(orderEntity); - erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_ONE); - } + CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(erpOrderEntity.getBindRlFk(), erpOrderEntity.getSupId()); + if (companyProductRelevanceEntity == null) { + orderEntity.setRemark(erpOrderEntity.getCoName() + "该产品非此供应商配送"); + checkStatus = ConstantStatus.ORDER_CHECK_FAIL; } else { orderEntity.setContrastStatus(checkStatus); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java index b725462..a369e59 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java @@ -516,4 +516,19 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils { } return null; } + + public static String getBeforeMinute(String actDate, int hour) { + try { + long time = timeToStamp(actDate); + long move = hour * 1000 * 60 * 60*60; + time = time - move; + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(time); + String res = simpleDateFormat.format(date); + return res; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } } \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 48c405e..4161c2c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -38,7 +38,11 @@ LIMIT 1 - + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 9ca0b77..02671fe 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -80,6 +80,9 @@ AND inv_warehouse_user.`code` = #{code} + + AND inv_warehouse_user.`userId` = #{userId} + group by basic_bussiness_type.action diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 65589b4..1a2d792 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -16,7 +16,7 @@ basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, - basic_bussiness_type.secCheckBalacne + basic_bussiness_type.secCheckBalacne, defaultUnit FROM basic_bussiness_type LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_bustype_local.action @@ -45,7 +45,7 @@ resultType="com.glxp.sale.admin.res.basic.BussinessTypResponse"> select basic_bussiness_type.*, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, - basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, + basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,defaultUnit, basic_bustype_local.spUse,basic_bussiness_type.storageCode from basic_bussiness_type LEFT JOIN basic_third_sys on basic_bussiness_type.thirdSysFk = basic_third_sys.thirdId LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = @@ -91,7 +91,7 @@ basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, - basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, + basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit, basic_bussiness_type.secCheckBalacne FROM basic_bussiness_type LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_bustype_local.action @@ -117,6 +117,10 @@ AND basic_bustype_local.spUse =#{spUse} + + AND inv_warehouse.`code` =#{locInvCode} + + group by basic_bussiness_type.action @@ -130,7 +134,7 @@ checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne, - secCheckBalacne,supplementOrderType) + secCheckBalacne,supplementOrderType,defaultUnit) values ( #{action}, @@ -157,7 +161,11 @@ #{secCheckWebNew}, #{secCheckChange}, #{corpType}, - #{storageCode},#{checkBalacne},#{secCheckBalacne},#{supplementOrderType} + #{storageCode}, + #{checkBalacne}, + #{secCheckBalacne}, + #{supplementOrderType}, + #{defaultUnit} ) @@ -171,7 +179,7 @@ checkEnable,genUnit,innerOrder,secCheckEnable, checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, - secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType) + secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit) values ( #{index}, @@ -199,7 +207,11 @@ #{secCheckWebNew}, #{secCheckChange}, #{corpType}, - #{storageCode},#{checkBalacne},#{secCheckBalacnesecCheckBalacne},#{supplementOrderType} + #{storageCode}, + #{checkBalacne}, + #{secCheckBalacnesecCheckBalacne}, + #{supplementOrderType}, + #{defaultUnit} ) @@ -235,6 +247,8 @@ corpType=#{corpType}, storageCode=#{storageCode}, supplementOrderType=#{supplementOrderType}, + defaultUnit=#{defaultUnit}, + thirdSysFk=#{thirdSysFk}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index b733d54..b46d2e7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -239,6 +239,8 @@ where code = #{code} + + delete from inv_warehouse_bussiness_type diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index 44dcb96..8058020 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -246,6 +246,12 @@ where code = #{code} + + delete from inv_warehouse_user diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml index 8bc8100..fa7ce9f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -8,31 +8,31 @@ SELECT * FROM inv_product - AND productsName = #{productsName} + AND inv_product.productsName like concat('%',#{productsName},'%') - AND nameCode = #{nameCode} + AND inv_product.nameCode = #{nameCode} - AND relIdFk = #{relIdFk} + AND inv_product.relIdFk = #{relIdFk} - AND ggxh = #{ggxh} + AND inv_product.ggxh like concat('%',#{ggxh},'%') - AND batchNo = #{batchNo} + AND inv_product.batchNo like concat('%',#{batchNo},'%') - AND productionDate = #{productionDate} + AND inv_product.productionDate = #{productionDate} - AND expireDate = #{expireDate} + AND inv_product.expireDate = #{expireDate} - AND ylqxzcrbarmc = #{ylqxzcrbarmc} + AND inv_product.ylqxzcrbarmc like concat('%',#{ylqxzcrbarmc},'%') - AND zczbhhzbapzbh = #{zczbhhzbapzbh} + AND inv_product.zczbhhzbapzbh =like concat('%',#{zczbhhzbapzbh},'%') AND customerId = #{customerId} @@ -49,7 +49,6 @@ AND invWarehouseCode = #{invWarehouseCode} - GROUP BY #{groupType} @@ -106,20 +105,20 @@ left join inv_warehouse on inv_warehouse.code=inv_product.invStorageCode basic_products.diType=1 - - AND basic_products.cpmctymc = #{cpmctymc} + + AND inv_product.productsName like concat('%',#{productsName},'%') - AND basic_products.nameCode = #{nameCode} + AND inv_product.nameCode = #{nameCode} AND inv_product.relIdFk = #{relIdFk} - AND basic_products.ggxh = #{ggxh} + AND inv_product.ggxh like concat('%',#{ggxh},'%') - AND inv_product.batchNo = #{batchNo} + AND inv_product.batchNo like concat('%',#{batchNo},'%') AND inv_product.productionDate = #{productionDate} @@ -128,10 +127,10 @@ AND inv_product.expireDate = #{expireDate} - AND basic_products.ylqxzcrbarmc = #{ylqxzcrbarmc} + AND inv_product.ylqxzcrbarmc like concat('%',#{ylqxzcrbarmc},'%') - AND basic_products.zczbhhzbapzbh = #{zczbhhzbapzbh} + AND inv_product.zczbhhzbapzbh =like concat('%',#{zczbhhzbapzbh},'%') AND inv_product.customerId = #{customerId} @@ -149,6 +148,13 @@ AND invWarehouseCode = #{invWarehouseCode} + + AND invStorageCode IN + + #{id} + + + GROUP BY #{groupType} @@ -158,27 +164,27 @@ + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml index 7bc3c4a..a1558b1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml @@ -19,9 +19,12 @@ AND name = #{name} - + AND advanceType = #{advanceType} + + AND status = #{status} + AND isDefault = #{isDefault} @@ -47,7 +50,7 @@ AND pid = #{pid} - AND code = #{code} + AND inv_warehouse.code = #{code} AND name = #{name} diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index a6228f7..36297dd 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -24,7 +24,8 @@ - or code LIKE concat('%',#{unionCode},'%') or sptm LIKE concat('%',#{unionCode},'%') or ybbm LIKE concat('%',#{unionCode},'%') + or code LIKE concat('%',#{unionCode},'%') or sptm LIKE concat('%',#{unionCode},'%') or ybbm LIKE + concat('%',#{unionCode},'%') @@ -35,6 +36,30 @@ + + + - select * FROM thr_products WHERE id = #{id} + select * + FROM thr_products + WHERE id = #{id} - replace INTO thr_products + replace + INTO thr_products ( code,name,measname,spec,registerNo,manufactory, cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, @@ -58,16 +86,26 @@ ) values ( - #{code}, - #{name}, - #{measname}, - #{spec}, - #{registerNo}, - #{manufactory}, - #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm}, - #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms}, - #{thirdSysFk},#{updateTime},#{supName} - ) + #{code}, + #{name}, + #{measname}, + #{spec}, + #{registerNo}, + #{manufactory}, + #{cplb}, + #{flbm}, + #{qxlb}, + #{ybbm}, + #{sptm}, + #{tyshxydm}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarmc}, + #{ylqxzcrbarywmc}, + #{cpms}, + #{thirdSysFk}, + #{updateTime}, + #{supName} + ) @@ -96,7 +134,9 @@ - DELETE FROM thr_products WHERE id = #{id} + DELETE + FROM thr_products + WHERE id = #{id} @@ -127,27 +167,28 @@ - DELETE FROM thr_products + DELETE + FROM thr_products replace INTO thr_products - (id, code, name, measname, spec, registerNo, manufactory, - cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, - thirdSysFk, updateTime, supName) - values + (id, code, name, measname, spec, registerNo, manufactory, + cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, + thirdSysFk, updateTime, supName) + values (#{item.id}, - #{item.code}, - #{item.name}, - #{item.measname}, - #{item.spec}, - #{item.registerNo}, - #{item.manufactory}, - #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm}, #{item.sptm}, - #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.cpms}, - #{item.thirdSysFk}, #{item.updateTime}, #{item.supName}) + #{item.code}, + #{item.name}, + #{item.measname}, + #{item.spec}, + #{item.registerNo}, + #{item.manufactory}, + #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm}, #{item.sptm}, + #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.cpms}, + #{item.thirdSysFk}, #{item.updateTime}, #{item.supName})