From 258bddc2139541cb4db3932537d3d788a8439a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 19 Dec 2022 09:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/inout/WareHouseController.java | 2 ++ .../inventory/InvSubWarehouseController.java | 5 ----- .../glxp/api/admin/entity/inout/OrderEntity.java | 3 +++ .../api/admin/entity/thrsys/ThrOrderEntity.java | 1 + .../api/admin/req/basic/FilterUdiInfoRequest.java | 1 + .../glxp/api/admin/req/inout/AddOrderRequest.java | 2 ++ .../admin/service/inout/impl/CodesServiceImpl.java | 5 +++-- .../admin/service/inout/impl/OrderServiceImpl.java | 13 +++++++------ .../mapper/basic/CompanyProductRelevanceDao.xml | 2 +- .../resources/mybatis/mapper/inout/OrderDao.xml | 4 +++- .../mybatis/mapper/inventory/InvPreInProductDao.xml | 4 ++-- .../mybatis/mapper/inventory/InvProductDao.xml | 5 ++++- .../src/main/resources/schemas/schema_v2.1.sql | 7 ------- 13 files changed, 29 insertions(+), 25 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index e9a8f82a..655763ee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -301,6 +301,8 @@ public class WareHouseController { orderEntity1.setPreCheck(addOrderRequest.isPreCheck()); orderEntity1.setUpdateTime(new Date()); orderEntity1.setCodeFillCheck(addOrderRequest.isCodeFillCheck()); + orderEntity1.setInvStorageCode(addOrderRequest.getInvStorageCode()); + orderEntity1.setSubInvCode(addOrderRequest.getSubInvCode()); orderService.updateOrder(orderEntity1); WarehouseEntity warehouseEntity = new WarehouseEntity(); warehouseEntity.setOrderId(addOrderRequest.getOrderId()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index 47876444..fd2be6a8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -87,12 +87,7 @@ public class InvSubWarehouseController { } } else{ if(filterInvWarehouseRequest.getFilter()==3 && filterInvWarehouseRequest.getFilter()!=null){ - - if (authAdmin.getCustomerId()==110) filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); - else { - filterInvWarehouseRequest.setSpUse(true); - } }else{ //走这边表示单据选择的是往来单位里面调出调入的库 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java index 65366f6e..fc467cbc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java @@ -88,4 +88,7 @@ public class OrderEntity { private String uploadStatus; private String wzUploadStatus; private String wzUploadResult; + + private String subInvCode; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java index 6673d884..bad726a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java @@ -18,6 +18,7 @@ public class ThrOrderEntity { private String billFlag; private String thirdSysFk; private Date updateTime; + private Date thirdPartyDate; private String originType; //增加字段 diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java index 025ddf07..30d1bc44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -58,5 +58,6 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String unitFk; private String originUuid; private String relId; + private String companyName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java index 539fddaa..3b395885 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java @@ -35,5 +35,7 @@ public class AddOrderRequest { private boolean codeFillCheck; private String deptCode; + private String subInvCode; + private String invStorageCode; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java index 39b443b7..5c0e5d44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java @@ -225,7 +225,8 @@ public class CodesServiceImpl implements CodesService { } else { filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo()); } - InvProductEntity invProductEntity = invProductDao.filterInvProduct(filterInvProductRequest).get(0); + List invProductEntityList=invProductDao.filterInvProduct(filterInvProductRequest); + InvProductEntity invProductEntity = invProductEntityList.get(0); if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { //入库 invProductEntity.setInCount(invProductEntity.getInCount() - 1); @@ -278,7 +279,7 @@ public class CodesServiceImpl implements CodesService { StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailEntities.get(0); if (stockOrderDetailEntity.getReCount() > 1) { stockOrderDetailEntity.setReCount(stockOrderDetailEntity.getReCount()- 1); //实际数量 - 1 - stockOrderDetailEntity.setSweepCount(stockOrderDetailEntity.getSweepCount() -1); //扫码数量 -1 + stockOrderDetailEntity.setSweepCount(stockOrderDetailEntity.getSweepCount()==null?0:stockOrderDetailEntity.getSweepCount() -1); //扫码数量 -1 //更新业务单据详情 stockOrderDetailDao.updateById(stockOrderDetailEntity); } else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 33f962a2..cc59b404 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -308,17 +308,20 @@ public class OrderServiceImpl implements OrderService { } else { supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 } - + String name = invWarehouseDao.getNameByCode(supplementOrder.getInvStorageCode()); supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); //修改往来单位及当前库存号 - supplementOrder.setFromCorpId(order.getLocStorageCode()); + supplementOrder.setFromCorpId(order.getInvWarehouseCode()); + supplementOrder.setFromCorp(name); supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); - supplementOrder.setLocStorageCode(order.getFromCorpId()); + supplementOrder.setLocStorageCode(order.getSubInvCode()); + supplementOrder.setSubInvCode(order.getInvStorageCode()); supplementOrder.setInvWarehouseCode(null); - String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); + supplementOrder.setInvStorageCode(order.getSubInvCode()); + if (StrUtil.isNotEmpty(order.getFromSubInvCode())) { supplementOrder.setInvWarehouseCode(order.getFromSubInvCode()); } else { @@ -328,8 +331,6 @@ public class OrderServiceImpl implements OrderService { } } - - supplementOrder.setFromCorp(name); supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType()); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 8735c9ca..a3391d3b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -141,7 +141,7 @@ AND basic_udirel.id = #{id} - AND customer_info.companyName = #{companyName} + AND basic_corp.name = #{companyName} AND basic_udirel.lockStatus = #{lockStatus} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 986d84eb..234cd6db 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -68,7 +68,7 @@ receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo) + fromSubInvCode,subInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo) values ( #{id}, #{action}, @@ -102,6 +102,7 @@ #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, + #{subInvCode}, #{createTime}, #{originFromType}, #{invStorageCode}, @@ -150,6 +151,7 @@ auditTime=#{auditTime}, replicateNo=#{replicateNo}, fromSubInvCode=#{fromSubInvCode}, + subInvCode=#{subInvCode}, createTime=#{createTime}, originFromType=#{originFromType}, deptCode=#{deptCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index a58c7f4b..93aad7ac 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -122,8 +122,8 @@ inv_prein_product.batchNo ,inv_prein_product.productionDate,inv_prein_product.expireDate, basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, - inv_prein_product.inCount,inv_prein_product.outCount - ,inv_prein_product.reCount,inv_prein_product.customerId, + sum(inv_prein_product.inCount) as inCount,sum(inv_prein_product.outCount) as outCount, + sum(inv_prein_product.reCount) as reCount,inv_prein_product.customerId, basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price,inv_warehouse_sub.name invSubStorageName ,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk 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 85e399ac..789eb989 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -19,9 +19,12 @@ AND inv_product.ggxh like concat('%', #{ggxh}, '%') - + AND inv_product.batchNo like concat('%', #{batchNo}, '%') + + AND inv_product.batchNo is NULL + AND inv_product.productionDate = #{productionDate} diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 851ba98f..f4b62503 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -4,13 +4,6 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); -INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark) -VALUES -(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据'); - -INSERT ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) -VALUES - ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' );