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); })