diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 921ce918..3c730bd6 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -178,9 +178,6 @@ public class BasicBussinessTypeController extends BaseController { public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { List bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index ca1ed05b..913207a3 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -151,64 +151,70 @@ public class PurOrderController { PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); purOrderEntity.setUpdateTime(new Date()); purOrderService.update(purOrderEntity); -// String billNo = ""; -// List purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); -// -// //对计划单里面的供应商进行分组 -// Map> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); -// -// if (postPurOrderRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { -// -// if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true -// && StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) { -// -// for (Map.Entry> m : map.entrySet()) { -// //生产单据表信息 -// IoOrderEntity ioOrderEntity = new IoOrderEntity(); -// ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); -// ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); -// ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); -// ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction()); -// ioOrderEntity.setFromCorp(m.getKey()); -// ioOrderEntity.setFromType(ConstantStatus.FROM_Order); -// ioOrderEntity.setStatus(1); -// ioOrderEntity.setDealStatus(1); -// ioOrderEntity.setOrderType(1); -// ioOrderEntity.setCreateTime(new Date()); -// ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); -// ioOrderEntity.setUpdateTime(new Date()); -// ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); -// ioOrderEntity.setCustomerId("110"); -// ioOrderEntity.setDeptCode(purOrderEntity.getDeptCode()); -// ioOrderEntity.setInvCode(purOrderEntity.getInvCode()); -// ioOrderService.insertOrder(ioOrderEntity); -// billNo += ioOrderEntity.getBillNo() + ","; -// //插入业务单表 -// for (PurOrderDetailEntity obj : m.getValue()) { -// BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId()); -// IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); -// ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); -// ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); -// ioOrderDetailBizEntity.setCount(obj.getCount()); -// ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); -// ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); -// ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); -// ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); -// ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); -// ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); -// ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); -// ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); -// if (basicProductsEntity.getPrice() != null) { -// ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); -// } -// ioOrderDetailBizEntity.setSupId(obj.getSupId()); -// ioOrderDetailBizService.insert(ioOrderDetailBizEntity); -// } -// } -// purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1)); -// purOrderService.update(purOrderEntity); -// } -// } + + if(postPurOrderRequest.isAutoPurchase() && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())){ + String billNo = ""; + List purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); + + //对计划单里面的供应商进行分组 + Map> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); + + + + if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true + && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) { + + for (Map.Entry> m : map.entrySet()) { + //生产单据表信息 + IoOrderEntity ioOrderEntity = new IoOrderEntity(); + ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); + ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); + ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); + ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction()); + ioOrderEntity.setFromCorp(m.getKey()); + ioOrderEntity.setFromType(ConstantStatus.FROM_Order); + ioOrderEntity.setStatus(1); + ioOrderEntity.setDealStatus(1); + ioOrderEntity.setOrderType(1); + ioOrderEntity.setCreateTime(new Date()); + ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); + ioOrderEntity.setUpdateTime(new Date()); + ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); + ioOrderEntity.setCustomerId("110"); + ioOrderEntity.setDeptCode(purOrderEntity.getDeptCode()); + ioOrderEntity.setInvCode(purOrderEntity.getInvCode()); + ioOrderService.insertOrder(ioOrderEntity); + billNo += ioOrderEntity.getBillNo() + ","; + //插入业务单表 + for (PurOrderDetailEntity obj : m.getValue()) { + BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId()); + IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); + ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); + ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); + ioOrderDetailBizEntity.setCount(obj.getCount()); + ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); + ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); + ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); + ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); + ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); + ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); + ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); + ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); + if (basicProductsEntity.getPrice() != null) { + ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); + } + ioOrderDetailBizEntity.setSupId(obj.getSupId()); + ioOrderDetailBizService.insert(ioOrderDetailBizEntity); + } + } + purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1)); + purOrderService.update(purOrderEntity); + } + + } + + + return ResultVOUtils.success("更新成功!"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index f6647c24..08d6ff15 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -153,6 +153,7 @@ public class SupCertController { public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) { supCertEntity.setCreateTime(new Date()); supCertEntity.setUpdateTime(new Date()); + supCertEntity.setStatus(0); boolean b = supCertService.insertCompanyCert(supCertEntity); return ResultVOUtils.success("成功"); } @@ -330,7 +331,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", "d:/1s/udiwms/register/file/image2/" + obj.getFilePath()); + supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + obj.getFilePath()); list.add(supData); i++; } @@ -442,7 +443,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", "d:/1s/udiwms/register/file/image2/" + obj.getFilePath()); + supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + obj.getFilePath()); list.add(supData); i++; } @@ -504,7 +505,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", "d:/1s/udiwms/register/file/image2/" + obj.getFilePath()); + supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + obj.getFilePath()); list.add(supData); i++; }