From 334f91ecfb0af1186d1e57ac6afa9116425eb280 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 17 Aug 2022 17:01:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E7=8A=B6=E6=80=81=E5=80=BC?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java index 68eb1284..298080ea 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java @@ -22,6 +22,7 @@ public class PermissionRuleTreeUtils { for (AuthPermissionRule v : authPermissionRuleList) { AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse(); BeanUtils.copyProperties(v, authPermissionRuleMergeResponse); + authPermissionRuleMergeResponse.setStatus(Long.valueOf(v.getStatus())); if (pid.equals(v.getPid())) { authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId())); authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse); From 6e1edf513160d7e794ab3b67b33a389f0be33bc4 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 19 Aug 2022 17:57:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockQRCodeTextController.java | 9 +++++++++ .../admin/controller/inout/OrderController.java | 14 ++++++++++++++ .../entity/business/StockOrderPrintEntity.java | 2 ++ .../glxp/api/admin/entity/inout/OrderEntity.java | 2 ++ .../admin/service/inout/impl/OrderServiceImpl.java | 3 +++ .../api/admin/util/PermissionRuleTreeUtils.java | 2 +- .../resources/mybatis/mapper/inout/OrderDao.xml | 12 ++++++++---- 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java index edfccd23..f3f8ef91 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java @@ -13,6 +13,7 @@ import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.entity.inventory.StockPrintTempEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; @@ -37,6 +38,7 @@ import com.glxp.api.admin.service.business.StockOrderDetailTempService; import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.business.StockQRCodeTextService; import com.glxp.api.admin.service.info.*; +import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.admin.service.inventory.StockPrintTempService; import com.glxp.api.admin.thread.IoTransInoutService; @@ -67,6 +69,8 @@ public class StockQRCodeTextController { @Resource StockOrderService stockOrderService; @Resource + OrderService orderService; + @Resource StockOrderDetailService stockOrderDetailService; @Resource StockQRCodeTextService stockQRCodeTextService; @@ -375,6 +379,7 @@ public class StockQRCodeTextController { systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId()); systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType()); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); + OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk()); List systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return; @@ -403,6 +408,7 @@ public class StockQRCodeTextController { stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1()); stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2()); stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3()); + stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark()); index++; } @@ -429,6 +435,7 @@ public class StockQRCodeTextController { systemPDFModuleEntity.setRemark2(systemPDFTemplateRelevanceResponse.getRemark2()); systemPDFModuleEntity.setRemark3(systemPDFTemplateRelevanceResponse.getRemark3()); + if (systemPDFTemplateEntity == null) return; int index = 1; @@ -442,6 +449,8 @@ public class StockQRCodeTextController { stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1()); stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2()); stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3()); + + stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark()); StockOrderDetailEntity stockOrderDetailEntity = getDetailByRelBatch(stockOrderDetailEntities, stockOrderPrintEntity.getProductId(), stockOrderPrintEntity.getBatchNo()); if (stockOrderDetailEntity != null) { stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 9c4688b9..b226e3a3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -177,6 +177,20 @@ public class OrderController { return ResultVOUtils.success("删除成功"); } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inout/order/updateOrder") + public BaseResponse updateOrder(@RequestBody OrderEntity orderEntity, + BindingResult bindingResult) { + orderEntity.setUpdateTime(new Date()); + boolean b = orderService.updateOrder(orderEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("更新成功"); + } + + @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateUnit") public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity, diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java index cc55a7bb..2fbdde68 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java @@ -53,4 +53,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String udiCode; //条码 private String serialNo; //序列号 private String nameCode; + private String billRemark; + } 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 32ea95f5..d42ef045 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 @@ -65,4 +65,6 @@ public class OrderEntity { private String billTypeName; private String subInvName; private String invName; + + private String printRemark; } 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 f1b70c0a..c1b632c2 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 @@ -209,6 +209,9 @@ public class OrderServiceImpl implements OrderService { public OrderEntity findById(String orderId) { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setId(orderId); + if (StrUtil.isEmpty(orderId)) { + return null; + } return orderDao.findOne(orderFilterRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java index 68eb1284..a00138ad 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java @@ -22,6 +22,7 @@ public class PermissionRuleTreeUtils { for (AuthPermissionRule v : authPermissionRuleList) { AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse(); BeanUtils.copyProperties(v, authPermissionRuleMergeResponse); + authPermissionRuleMergeResponse.setStatus(Long.valueOf(v.getStatus())); if (pid.equals(v.getPid())) { authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId())); authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse); @@ -33,5 +34,4 @@ public class PermissionRuleTreeUtils { } - } 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 602ca27c..18db579b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -34,7 +34,7 @@ receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime, originFromType,invStorageCode) + fromSubInvCode, createTime, originFromType, invStorageCode, printRemark) values (#{id}, #{action}, #{corpOrderId}, @@ -54,7 +54,8 @@ #{stockCheckFk}, #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}, #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck}, - #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{invStorageCode}) + #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType}, + #{invStorageCode}, #{printRemark}) @@ -64,7 +65,7 @@ fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, - outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode) + outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode,printRemark) values ( #{id}, #{action}, @@ -99,7 +100,9 @@ #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, - #{originFromType},#{invStorageCode} + #{originFromType}, + #{invStorageCode}, + #{printRemark} ) @@ -142,6 +145,7 @@ fromSubInvCode=#{fromSubInvCode}, createTime=#{createTime}, originFromType=#{originFromType}, + printRemark=#{printRemark}, WHERE id = #{id} From 76a6e6362029bbabb36af895ef529b41346ff4d6 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 22 Aug 2022 09:40:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/entity/basic/ProductInfoEntity.java | 9 ++ .../business/StockOrderPrintEntity.java | 1 + .../admin/req/inout/OrderFilterRequest.java | 2 + .../api/admin/res/basic/UdiTraceResponse.java | 1 + .../service/basic/UdiContrastService.java | 1 - .../mybatis/mapper/basic/ProductInfoDao.xml | 86 +++++++++---------- .../mybatis/mapper/business/StockOrderDao.xml | 68 ++++++++------- .../mybatis/mapper/inout/OrderDao.xml | 5 +- 8 files changed, 96 insertions(+), 77 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java index f4188dbc..2263fa46 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java @@ -58,4 +58,13 @@ public class ProductInfoEntity { private String cplx; private String hchzsb; + private String sfwblztlcp; + private String cgzmraqxgxx; + private String sfbjwycxsy; + private String zdcfsycs; + private String sfwwjbz; + private String syqsfxyjxmj; + private String qtxxdwzlj; + private String mjfs; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java index 2fbdde68..f069e89d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java @@ -54,5 +54,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String serialNo; //序列号 private String nameCode; private String billRemark; + private String deptName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java index 14a8f648..ce4962ed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java @@ -46,4 +46,6 @@ public class OrderFilterRequest extends ListPageRequest { private Integer entrustId; private boolean entrust; private String invWarehouseCode; + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java index 2fc966a2..be463136 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java @@ -9,6 +9,7 @@ public class UdiTraceResponse { private String actDate; private String mainAction; private String action; + private String actionName; private String fromCorp; private Integer count; private String cpmctymc; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java index 8efc13d3..c44b7bd5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java @@ -121,7 +121,6 @@ public class UdiContrastService { - @Resource GennerOrderUtils gennerOrderUtils; @Resource diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index 6ef649c4..895a3625 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -268,48 +268,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName, stock_order_detail.spec, - stock_order_detail.batchNo, stock_order_detail.productDate, stock_order_detail.expireDate, - stock_order_detail.count, stock_order_detail.sweepCount, - stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, - stock_order_detail.zczbhhzbapzbh,stock_order_detail.price,inv_warehouse.name locInv + SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName, + stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate, + stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount, + stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh, + stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc, + basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName ,basic_products.spmc FROM stock_order INNER JOIN stock_order_detail on @@ -285,6 +294,7 @@ LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` left join basic_udirel on stock_order_detail.productId = basic_udirel.id INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid + left join auth_dept on stock_order.dept = auth_dept.`code` and stock_order.id =#{id} @@ -333,20 +343,17 @@ - select id from stock_order where orderIdFk = #{orderIdFk} @@ -389,7 +396,8 @@ select t1.* from stock_order t1 left join io_order t2 on t1.billNo = t2.erpFk - AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like concat('%',#{request.billNo},'%')) + AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like + concat('%',#{request.billNo},'%')) AND t2.exportStatus = #{request.submitStatus} @@ -419,6 +427,8 @@ order by t1.billdate desc \ No newline at end of file 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 18db579b..f8220da6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -289,7 +289,10 @@