From d3511fd490160ed7112a83b04ac790473912e73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 19 Sep 2024 09:10:39 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92mapper=E5=8F=8Aservice?= =?UTF-8?q?=E6=9C=89=E5=85=B3=E5=A7=94=E5=A4=96=E7=89=A9=E6=96=99=E7=9A=84?= =?UTF-8?q?mapper=E8=B0=83=E7=94=A8=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A7=94=E5=A4=96=E6=8A=A5=E4=BB=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=8E=BB=E9=87=8D=E6=96=B9=E6=B3=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E7=89=A9=E6=96=99mapper=E6=96=87=E4=BB=B6=EF=BC=9B=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E6=96=99=E5=8F=B7=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A7=94=E5=A4=96=E7=89=A9=E6=96=99mapper=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/OutsourceMaterialMapper.java | 90 ++++++++++++ .../system/mapper/OutsourcePlanMapper.java | 10 -- .../impl/OutsourcePlanServiceImpl.java | 8 +- .../mapper/system/OutsourceMaterialMapper.xml | 132 ++++++++++++++++++ .../mapper/system/OutsourcePlanMapper.xml | 31 ---- .../templates/system/outsource_quote/add.html | 38 +++-- 6 files changed, 245 insertions(+), 64 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceMaterialMapper.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/OutsourceMaterialMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceMaterialMapper.java new file mode 100644 index 00000000..146a09fb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceMaterialMapper.java @@ -0,0 +1,90 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.OutsourceMaterial; + +/** + * 委外物料Mapper接口 + * + * @author ruoyi + * @date 2024-09-18 + */ +public interface OutsourceMaterialMapper +{ + /** + * 查询委外物料 + * + * @param outsourceMaterialId 委外物料ID + * @return 委外物料 + */ + public OutsourceMaterial selectOutsourceMaterialById(Long outsourceMaterialId); + + /** + * 查询委外物料列表 + * + * @param outsourceMaterial 委外物料 + * @return 委外物料集合 + */ + public List selectOutsourceMaterialList(OutsourceMaterial outsourceMaterial); + + /** + * 新增委外物料 + * + * @param outsourceMaterial 委外物料 + * @return 结果 + */ + public int insertOutsourceMaterial(OutsourceMaterial outsourceMaterial); + + /** + * 修改委外物料 + * + * @param outsourceMaterial 委外物料 + * @return 结果 + */ + public int updateOutsourceMaterial(OutsourceMaterial outsourceMaterial); + + /** + * 删除委外物料 + * + * @param outsourceMaterialId 委外物料ID + * @return 结果 + */ + public int deleteOutsourceMaterialById(Long outsourceMaterialId); + + /** + * 批量删除委外物料 + * + * @param outsourceMaterialIds 需要删除的数据ID + * @return 结果 + */ + public int deleteOutsourceMaterialByIds(String[] outsourceMaterialIds); + + /** + * 作废委外物料 + * + * @param outsourceMaterialId 委外物料ID + * @return 结果 + */ + public int cancelOutsourceMaterialById(Long outsourceMaterialId); + + /** + * 恢复委外物料 + * + * @param outsourceMaterialId 委外物料ID + * @return 结果 + */ + public int restoreOutsourceMaterialById(Long outsourceMaterialId); + + /** + * 查询委外物料 + * + * @param materialNo 需要查询的数据编码 + * @return 结果 + */ +// public OutsourceMaterial selectMaterialByCode(String materialNo); + + + public List selectProcessNoByNo (String materialNo); + + public int deleteOutsourceMaterialByNo(String materialNo); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourcePlanMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourcePlanMapper.java index 87a92e96..a22f8ade 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourcePlanMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourcePlanMapper.java @@ -88,16 +88,6 @@ public interface OutsourcePlanMapper */ public List selectOutsourcePlanByCodes(String[] outsourcePlanCodes); - /** - * 查询委外物料 - * - * @param materialNo 需要查询的数据编码 - * @return 结果 - */ - public OutsourceMaterial selectMaterialByCode(String materialNo); - - - public List selectProcessNoByNo (String materialNo); /** * 批量删除委外计划详情 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java index 7e0fb560..329b633d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.system.domain.OutsourcePlanDetail; import com.ruoyi.system.domain.OutsourceQuoteChild; import com.ruoyi.system.domain.Vo.OutsourceProcessVo; import com.ruoyi.system.domain.Vo.Supplier; +import com.ruoyi.system.mapper.OutsourceMaterialMapper; import com.ruoyi.system.mapper.OutsourcePlanMapper; import com.ruoyi.system.mapper.OutsourceProcessMapper; import com.ruoyi.system.mapper.OutsourceQuoteMapper; @@ -40,6 +41,9 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService @Autowired private OutsourceQuoteMapper outsourceQuoteMapper; + + @Autowired + private OutsourceMaterialMapper outsourceMaterialMapper; /** * 查询委外计划 * @@ -118,7 +122,7 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService // 获取物料信息 @Override public OutsourceMaterial selectMaterialByCode(String materialNo) { - List materialList = outsourcePlanMapper.selectProcessNoByNo(materialNo); + List materialList = outsourceMaterialMapper.selectProcessNoByNo(materialNo); OutsourceMaterial shareMaterial = materialList.get(0); OutsourceMaterial material = new OutsourceMaterial(); material.setMaterialNo(shareMaterial.getMaterialNo()); @@ -131,7 +135,7 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService material.setDescription(shareMaterial.getDescription()); material.setProcessMethod(shareMaterial.getProcessMethod()); // 获取委外计划表中的物料信息中的工序编号，以查询同料号的所有工序 - List materials = outsourcePlanMapper.selectProcessNoByNo(material.getMaterialNo()); + List materials = outsourceMaterialMapper.selectProcessNoByNo(material.getMaterialNo()); List noList = materials.stream().map(OutsourceMaterial::getOutsourceProcessNo).collect(Collectors.toList()); List processVoS = supplierClassification(noList); diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceMaterialMapper.xml new file mode 100644 index 00000000..addfcb50 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceMaterialMapper.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + select outsource_material_id, material_no, material_name, material_type, material_photoUrl, description, brand, unit, planned_outsource_amount, process_method, outsource_process_no, outsource_process_name from outsource_material + + + + + + + + insert into outsource_material + + material_no, + material_name, + material_type, + material_photoUrl, + description, + brand, + unit, + planned_outsource_amount, + process_method, + outsource_process_no, + outsource_process_name, + + + #{materialNo}, + #{materialName}, + #{materialType}, + #{materialPhotourl}, + #{description}, + #{brand}, + #{unit}, + #{plannedOutsourceAmount}, + #{processMethod}, + #{outsourceProcessNo}, + #{outsourceProcessName}, + + + + + update outsource_material + + material_no = #{materialNo}, + material_name = #{materialName}, + material_type = #{materialType}, + material_photoUrl = #{materialPhotourl}, + description = #{description}, + brand = #{brand}, + unit = #{unit}, + planned_outsource_amount = #{plannedOutsourceAmount}, + process_method = #{processMethod}, + outsource_process_no = #{outsourceProcessNo}, + outsource_process_name = #{outsourceProcessName}, + + where outsource_material_id = #{outsourceMaterialId} + + + + delete from outsource_material where outsource_material_id = #{outsourceMaterialId} + + + + delete from outsource_material where outsource_material_id in + + #{outsourceMaterialId} + + + + + update outsource_material set del_flag = '1' where outsource_material_id = #{outsourceMaterialId} + + + + update outsource_material set del_flag = '0' where outsource_material_id = #{outsourceMaterialId} + + + + + + + + + + + + + + delete from outsource_material where material_no = #{materialNo} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml index a907aa02..e527d24e 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml @@ -21,23 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - @@ -169,20 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - delete from outsource_plan_detail where outsource_plan_code in diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html index 4f9cfabd..ca6892fa 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/add.html @@ -318,40 +318,36 @@ // // 这里取到的是多行的 var rowData = layero.find("iframe")[0].contentWindow.getSelections(); //判断是否重复 - console.log(rowData); - var rows = $("#bootstrap-table").bootstrapTable('getData').length; + var data = $("#bootstrap-table-process").bootstrapTable('getData'); + var rows = data.length; if(rows>0){ for(var i=0;i