From cd3f09e887a8677bcbb5644d3521b834bd3dc171 Mon Sep 17 00:00:00 2001 From: x_z Date: Sun, 12 Mar 2023 17:04:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=EF=BC=8C=E8=AE=BE=E5=A4=87=E9=A2=86=E7=94=A8=E7=AD=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/InvCountCodesController.java | 2 +- .../glxp/api/entity/inv/InvPreinOrderEntity.java | 7 +++++++ .../glxp/api/res/inv/InvPreinOrderResponse.java | 2 +- .../glxp/api/service/inout/IoGenInvService.java | 1 - .../impl/DeviceReceiveOrderDetailServiceImpl.java | 1 + .../inv/impl/InvCountCodesServiceImpl.java | 15 +++++++++++++++ .../inv/impl/InvCountOrderDetailServiceImpl.java | 2 +- .../mybatis/mapper/inv/invProductDao.xml | 2 +- 8 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java b/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java index a5714534c..adf958a57 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java @@ -51,7 +51,7 @@ public class InvCountCodesController { @PostMapping("/inv/count/codes/deleteCode") public BaseResponse deleteCode(@RequestBody FilterInvCountCodesRequest codesRequest) { if (null == codesRequest || StrUtil.isBlank(codesRequest.getOrderIdFk()) || StrUtil.isBlank(codesRequest.getRelId()) || StrUtil.isBlank(codesRequest.getCode())) { - return ResultVOUtils.success(ResultEnum.PARAM_VERIFY_FALL); + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } return invCountCodesService.deleteCode(codesRequest); } diff --git a/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java index 2f98b9c5c..ab9f7ee0d 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java @@ -11,6 +11,7 @@ import java.util.Date; @Data @TableName(value = "inv_prein_order") public class InvPreinOrderEntity { + @TableId(value = "id", type = IdType.AUTO) private Integer id; @@ -20,6 +21,12 @@ public class InvPreinOrderEntity { @TableField(value = "billNo") private String billNo; + /** + * 单据类型 + */ + @TableField(value = "action") + private String action; + /** * 往来单位 */ diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java index 8b8168e15..f1dd792ba 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java @@ -69,7 +69,7 @@ public class InvPreinOrderResponse { */ private String remark; - private String billTypeNames; + private String billTypeName; private String createUserName; private String updateUserName; private String reviewUserName; diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 70ae59d40..28c123cff 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -8,7 +8,6 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java index 9e5db2cf1..fd23c88b7 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -106,6 +106,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe filterInvProductDetailRequest.setBatchNo(invProductEntity.getBatchNo()); filterInvProductDetailRequest.setDeptCode(invProductEntity.getDeptCode()); filterInvProductDetailRequest.setInvCode(invProductEntity.getInvCode()); + filterInvProductDetailRequest.setInvSpaceCode(addDetailRequest.getInvSpaceCode()); List invProductDetailEntities = invProductDetailDao.filterInvProductDetailList(filterInvProductDetailRequest); //计算出在仓库中的设备 //提取库存详情中不同的码 diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java index f859d11b6..fa4bcdcfb 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java @@ -72,6 +72,21 @@ public class InvCountCodesServiceImpl implements InvCountCodesService { //将此单据详情的盘点数量 - 1 invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() - udiCalCountUtil.getActCount(udi.getUdi())); + //盘点数量删减之后，重新计算盈亏状态 + int diff = invCountOrderDetail.getInvNum() - invCountOrderDetail.getCountNum(); + if (diff > 0) { + invCountOrderDetail.setLossNum(Math.abs(diff)); + //盘亏 + invCountOrderDetail.setStatus(0); + } else if (diff < 0) { + invCountOrderDetail.setProfitNum(Math.abs(diff)); + //盘盈 + invCountOrderDetail.setStatus(1); + } else { + //平衡 + invCountOrderDetail.setStatus(2); + } + //更新盘点单据详情 invCountOrderDetailDao.updateById(invCountOrderDetail); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java index 78338b754..d234fa1fc 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java @@ -73,7 +73,7 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic //查询单据信息 InvCountOrderEntity invCountOrder = invCountOrderDao.selectByOrderId(invCountOrderDetail.getOrderIdFk()); InvProductEntity invProductEntity = invProductDao.selectProductInfo(invCountOrderDetail.getRelId(), invCountOrderDetail.getBatchNo(), invCountOrder.getDeptCode(), invCountOrder.getInvCode(), invCountOrder.getInvSpaceCode()); - invCountOrderDetail.setInvNum(invProductEntity.getInCount() - invProductEntity.getOutCount()); + invCountOrderDetail.setInvNum(invProductEntity.getReCount()); invCountOrderDetail.setCountNum(0); invCountOrderDetailDao.insert(invCountOrderDetail); return ResultVOUtils.success(); diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 00dbc7586..8f168fa78 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -209,7 +209,7 @@ basic_products.ggxh, inv_product.inCount, inv_product.outCount, - sum(inv_product.inCount - inv_product.outCount) reCount, + inv_product.reCount, basic_products.cpmctymc from inv_product_detail left join inv_product on inv_product_detail.relId = inv_product.relIdFk