From 3fd4b177ed12af6d3de502e7a4c4f556bd8f7bdb Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sat, 6 Jul 2024 17:16:23 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A7=94=E5=86=85=E5=8A=A0=E5=B7=A5=E5=93=81=E8=B4=A8=E5=8D=95?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=90=8E=EF=BC=8C=E7=94=9F=E6=88=90=E5=A7=94?= =?UTF-8?q?=E5=86=85=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=92=8C=E5=A7=94=E5=86=85=E5=8A=A0=E5=B7=A5=E8=B4=B9=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityOrderServiceImpl.java | 1 - .../WarehouseStorageOrderServiceImpl.java | 9 ++++++- .../qualityOrder/makeInStartingQuality.html | 25 +++++++++++++++++-- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java index 647447aa..40bf8c58 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java @@ -323,7 +323,6 @@ public class QualityOrderServiceImpl implements IQualityOrderService //生成入库单号 String warehouseStorageCode = redisCache.generateBillNo("RK"); qualityOrder.setInStorageCode(warehouseStorageCode); - List qualityOrderDetailList = qualityOrder.getQualityOrderDetailList(); if (CollectionUtils.isEmpty(qualityOrderDetailList)){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index 9051285b..e2352fc5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -58,6 +58,9 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS @Autowired private RedisCache redisCache; + @Autowired + private QualityOrderDetailMapper qualityOrderDetailMapper; + /** * 查询仓库入库单 * @@ -414,9 +417,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS warehouseStorageOrder.setCreateBy(loginName); warehouseStorageOrder.setQualityTime(new Date()); warehouseStorageOrder.setCreateTime(new Date()); - + //设置委内完成数总价 + warehouseStorageOrder.setMakeInTotalPrice(tempQualityOrder.getMakeInTotalPrice()); //插入入库单详情数据 for (QualityOrderDetail qualityOrderDetail : qualityOrderDetailList) { + WarehouseStorageOrderDetail warehouseStorageOrderDetail = new WarehouseStorageOrderDetail(); warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageCode); warehouseStorageOrderDetail.setRelatedOrderCode(tempQualityOrder.getRelatedOrderCode()); @@ -426,6 +431,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS warehouseStorageOrderDetail.setWarehouseOrderType("1"); //当作委内入库数 warehouseStorageOrderDetail.setMakeStorageNum(qualityOrderDetail.getMakeInNum()); + //设置委内加工费单价 + warehouseStorageOrderDetail.setMakeInUnitPrice(qualityOrderDetail.getMakeInUnitPrice()); warehouseStorageOrderDetail.setMaterialNo(qualityOrderDetail.getMaterialNo()); warehouseStorageOrderDetail.setMaterialName(qualityOrderDetail.getMaterialName()); warehouseStorageOrderDetail.setMaterialBrand(qualityOrderDetail.getMaterialBrand()); diff --git a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeInStartingQuality.html b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeInStartingQuality.html index ca8ebd79..a9ddc145 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeInStartingQuality.html +++ b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeInStartingQuality.html @@ -99,9 +99,19 @@ return { "qualityOrderDetailId": item.qualityOrderDetailId, "materialNo": item.materialNo, + "materialNo": item.materialNo, + "materialName": item.materialName, + "materialType": item.materialType, + "materialPhotourl": item.materialPhotourl, + "materialDescribe": item.materialDescribe, + "materialBrand": item.materialBrand, + "materialUnit": item.materialUnit, + "materialProcessMethod": item.materialProcessMethod, "thisArrivedNum": item.thisArrivedNum, "qualityQualifiedNum": item.qualityQualifiedNum, - "qualityUnqualifiedNum": item.qualityUnqualifiedNum + "qualityUnqualifiedNum": item.qualityUnqualifiedNum, + "makeInUnitPrice": item.makeInUnitPrice, + "materialDeptType": item.materialDeptType, // ...其他字段 }; }); @@ -204,7 +214,18 @@ { title: '品质不合格数', field: 'qualityUnqualifiedNum', - }] + }, + { + title: '委内加工费单价', + field: 'makeInUnitPrice', + visible: false + }, + { + title: '物料入库部门', + field: 'materialDeptType', + visible: false + } + ] }; $.table.init(options); })