From 5cd6586c970d5aaa77f7ea0fdf3cabb824c7c553 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 27 Mar 2023 19:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 13 +++- .../purchase/PurOrderController.java | 68 +++++++++++++++++++ .../api/entity/purchase/PurOrderEntity.java | 3 + .../api/req/purchase/PurOrderRequest.java | 1 + .../api/res/purchase/PurOrderResponse.java | 2 + .../mybatis/mapper/purchase/PurOrderDao.xml | 5 +- src/main/resources/schemas/schema_v2.1.sql | 2 + 7 files changed, 90 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 958c5169..8cfc8fbb 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -7,6 +7,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; @@ -78,9 +79,15 @@ public class IoOrderDetailResultController extends BaseController { orderDetailResultRequest.setActions(actions); List list = orderDetailResultService.filterOrderList(orderDetailResultRequest); -// for (IoOrderDetailResultResponse orderDetailResultResponse : list) { -// if(orderDetailResultResponse.get) -// } + for (IoOrderDetailResultResponse orderDetailResultResponse : list) { + if (orderDetailResultResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { + orderDetailResultResponse.setOutCount(orderDetailResultResponse.getReCount()); + orderDetailResultResponse.setInCount(0); + } else { + orderDetailResultResponse.setOutCount(0); + orderDetailResultResponse.setInCount(orderDetailResultResponse.getReCount()); + } + } PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } 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 8baa25a6..ca1ed05b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -145,6 +145,74 @@ public class PurOrderController { } + @RepeatSubmit() + @PostMapping("/purchase/order/dealOrder") + public BaseResponse dealOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { + 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); +// } +// } + return ResultVOUtils.success("更新成功！"); + } + + /** * 审核采购订单 */ diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 0cb7095b..5cf85b6a 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -143,6 +143,9 @@ public class PurOrderEntity { */ @TableField(value = "arrivalTime") private Date arrivalTime; + @TableField(value = "dealStatus") + private int dealStatus; + public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java index a4ea787a..f74661d5 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java @@ -97,5 +97,6 @@ public class PurOrderRequest extends ListPageRequest { private String startAuditDate; private String endAuditDate; + private Integer dealStatus; } diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java index 06f024ce..a4ff03f5 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java @@ -79,4 +79,6 @@ public class PurOrderResponse { private String supId; private String supName; + + private int dealStatus; } diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index 77f29b26..8fcc3dd7 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -30,7 +30,7 @@ id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, - applyAuditUser, applyRemark, applyBillNo, stockOrderNo,supId + applyAuditUser, applyRemark, applyBillNo, stockOrderNo,supId,dealStatus @@ -83,6 +83,9 @@ AND deptCode = #{deptCode} + + AND dealStatus = #{dealStatus} + AND invCode = #{invCode} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 4a4c7f45..6e140f6e 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -85,6 +85,8 @@ CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1); CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1); + CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1); CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1);