From 4257e67ade5fa06973bd2c118e235ac0a6b229c7 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Sep 2023 15:52:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseEquipment.java | 122 ++++++++++++++++++ .../op/wms/mapper/BaseEquipmentMapper.java | 3 + .../impl/BaseEquipmentServiceImpl.java | 35 ++++- .../mapper/wms/BaseEquipmentMapper.xml | 8 ++ 4 files changed, 167 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index 116037f29..4ff608deb 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -93,10 +93,65 @@ public class BaseEquipment extends BaseEntity { @Excel(name = "工时单价") private String hourlyUnitPrice; + //附属字段 + /** 成型机存料状态 */ + @Excel(name = "成型机存料状态") + private String starving; + + /** 该成型机存放的物料 */ + @Excel(name = "该成型机存放的物料") + private String material; + + /** 烘房是否开门 */ + @Excel(name = "烘房是否开门") + private String isOpen; + + /** 烘房2门前小车数量 */ + @Excel(name = "烘房2门前小车数量") + private String dollyNumber; + + /** 烘房温度 */ + @Excel(name = "烘房温度") + private String temperature; + + /** 烘房压强 */ + @Excel(name = "烘房压强") + private String intensityOfPressure; + + /** 烘房湿度 */ + @Excel(name = "烘房湿度") + private String humidity; + + /** 烘房状态 */ + @Excel(name = "烘房状态") + private String state; + /** 删除标志 */ @Excel(name = "删除标志") private String delFlag; + /** 属性 */ + @Excel(name = "属性") + private String property; + + /** 说明 */ + @Excel(name = "说明") + private String explain; + + public void setExplain(String explain) { + this.explain = explain; + } + public String getExplain() { + return explain; + } + + public void setProperty(String property) { + this.property = property; + } + public String getProperty() { + return property; + } + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } @@ -104,6 +159,62 @@ public class BaseEquipment extends BaseEntity { return delFlag; } + public void setStarving(String starving) { + this.starving = starving; + } + public String getStarving() { + return starving; + } + + public void setMaterial(String material) { + this.material = material; + } + public String getMaterial() { + return material; + } + + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; + } + public String getIsOpen() { + return isOpen; + } + + public void setDollyNumber(String dollyNumber) { + this.dollyNumber = dollyNumber; + } + public String getDollyNumber() { + return dollyNumber; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + public String getTemperature() { + return temperature; + } + + public void setIntensityOfPressure(String intensityOfPressure) { + this.intensityOfPressure = intensityOfPressure; + } + public String getIntensityOfPressure() { + return intensityOfPressure; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + public String getHumidity() { + return humidity; + } + + public void setState(String state) { + this.state = state; + } + public String getState() { + return state; + } + public void setEquipmentId(Long equipmentId) { this.equipmentId = equipmentId; } @@ -274,6 +385,17 @@ public class BaseEquipment extends BaseEntity { .append("equipmentLocation", getEquipmentLocation()) .append("hourlyUnitPrice", getHourlyUnitPrice()) .append("delFlag", getDelFlag()) + + .append("humidity", getHumidity()) + .append("intensityOfPressure", getIntensityOfPressure()) + .append("starving", getStarving()) + .append("humidity", getHumidity()) + .append("temperature", getTemperature()) + .append("starving", getStarving()) + .append("material", getMaterial()) + .append("isOpen", getIsOpen()) + .append("property", getProperty()) + .append("explain", getExplain()) .toString(); } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java index 319bc2204..d42e19074 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java @@ -67,4 +67,7 @@ public interface BaseEquipmentMapper { String checkEquipmentNameUnique(BaseEquipment baseEquipment); String getWorkCenterName(BaseEquipment baseEquipment); + + //查询机器编码关联附属信息 + List getEquipmentAttachedList(String equipmentCode); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java index a1cf2e5e5..e53706892 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java @@ -31,7 +31,40 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { @Override @DS("#header.poolName") public BaseEquipment selectBaseEquipmentByEquipmentId(Long equipmentId) { - return baseEquipmentMapper.selectBaseEquipmentByEquipmentId(equipmentId); + BaseEquipment list = baseEquipmentMapper.selectBaseEquipmentByEquipmentId(equipmentId); + List attachedList = baseEquipmentMapper.getEquipmentAttachedList(list.getEquipmentCode()); +// if(list.getEquipmentTypeCode().equals("equ_type_cxj") || list.getEquipmentTypeCode().equals("equ_type_hf")){ + for(BaseEquipment example:attachedList){ + if(list.getEquipmentTypeCode().equals("equ_type_cxj")){ + if(example.getProperty().equals("material")){ + list.setMaterial(example.getExplain()); + }else{ + list.setStarving(example.getExplain()); + } + }else if(list.getEquipmentTypeCode().equals("equ_type_hf")){ + if(example.getProperty().equals("isopen")){ + //烘房是否开门 + list.setIsOpen(example.getExplain()); + }else if(example.getProperty().equals("dollyNumber")){ + //烘房前小车数量 + list.setDollyNumber(example.getExplain()); + }else if(example.getProperty().equals("temperature")){ + //烘房温度 + list.setTemperature(example.getExplain()); + }else if(example.getProperty().equals("intensityofpressure")){ + //烘房压强 + list.setIntensityOfPressure(example.getExplain()); + }else if(example.getProperty().equals("State")){ + //烘房状态 + list.setState(example.getExplain()); + }else{ + //烘房湿度 + list.setHumidity(example.getExplain()); + } + } + } +// } + return list; } /** diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index 256194e79..2f126c6ef 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -198,4 +198,12 @@ and del_flag = '0' + + \ No newline at end of file From 0b84c873a11130ecd3a1ad2ac5eb11c3ea8e8baa Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 20 Sep 2023 16:33:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E4=B8=8B=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E7=94=9F=E6=88=90=E9=9B=B6=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProOrderWorkorderServiceImpl.java | 90 +++++++++++-------- .../impl/ProWetMaterialPlanServiceImpl.java | 1 + .../mapper/plan/ProOrderWorkorderMapper.xml | 6 +- .../plan/ProWetMaterialPlanDetailMapper.xml | 9 +- 4 files changed, 62 insertions(+), 44 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index ea0fa7c88..80804f903 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -203,58 +203,47 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { @DS("#header.poolName") @Transactional(rollbackFor = Exception.class) public int downProOrderWorkorderByWorkorderIds(String[] workorderIds) { + List ids = new ArrayList<>(); - List workorders = proOrderWorkorderMapper.getWorkOrderByIds(workorderIds); - for (ProOrderWorkorder workorder : workorders) { - //关联工艺 - if (StringUtils.isNotBlank(workorder.getRouteCode())) { - List workDetails = proWorkorderProcessDetailMapper.getWorkOrderDetailsByRouteCode(workorder); - if (!CollectionUtils.isEmpty(workDetails)) { - workDetails.forEach(str -> { - str.setRecordId(IdUtils.fastSimpleUUID()); - str.setWorkorderId(workorder.getWorkorderId()); - str.setStatus("s0");//未执行 - str.setCreateBy(SecurityContextHolder.getUserName()); - str.setCreateTime(DateUtils.getNowDate()); - str.setFactoryCode(workorder.getFactoryCode()); - }); - proWorkorderProcessDetailMapper.addWorkOrderDetails(workDetails); - } - } - } List sapList = null;//回传给sap的工单 //如果是白坯生成备料单 for (String workorderId : workorderIds) { ProOrderWorkorder whiteOrder = proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(workorderId); + if (whiteOrder != null && "white".equals(whiteOrder.getProdType())) {//是白坯订单，自主生成领料单； - //备(领)料主单 - MesPrepareDTO mesPrepare = new MesPrepareDTO(); - BeanUtils.copyBeanProp(mesPrepare, whiteOrder); - mesPrepare.setPrepareId(whiteOrder.getWorkorderCode() + "L");//领料单号 - mesPrepare.setWorkorderCode(whiteOrder.getWorkorderCode()); - mesPrepare.setCreateBy(SecurityUtils.getUsername()); - mesPrepare.setCreateTime(DateUtils.getNowDate()); - mesPrepare.setStatus("L0");//待确认 - proOrderWorkorderMapper.createPrepare(mesPrepare); //备(领)料明细 ProWetMaterialPlanDetail planDetail = proWetMaterialPlanDetailMapper.getWetInfo(workorderId); - List details = new ArrayList<>(); - MesPrepareDetailDTO detail = new MesPrepareDetailDTO(); - detail.setCreateTime(DateUtils.getNowDate()); - detail.setCreateBy(SecurityUtils.getUsername()); - detail.setRecordId(IdUtils.fastSimpleUUID()); - detail.setPrepareId(whiteOrder.getWorkorderCode() + "L"); - if (planDetail != null) { + if(planDetail != null){ + //备(领)料主单 + MesPrepareDTO mesPrepare = new MesPrepareDTO(); + BeanUtils.copyBeanProp(mesPrepare, whiteOrder); + mesPrepare.setPrepareId(whiteOrder.getWorkorderCode() + "L");//领料单号 + mesPrepare.setWorkorderCode(whiteOrder.getWorkorderCode()); + mesPrepare.setCreateBy(SecurityUtils.getUsername()); + mesPrepare.setCreateTime(DateUtils.getNowDate()); + mesPrepare.setStatus("L0");//待确认 + proOrderWorkorderMapper.createPrepare(mesPrepare); + //备(领)料明细 + + List details = new ArrayList<>(); + MesPrepareDetailDTO detail = new MesPrepareDetailDTO(); + detail.setCreateTime(DateUtils.getNowDate()); + detail.setCreateBy(SecurityUtils.getUsername()); + detail.setRecordId(IdUtils.fastSimpleUUID()); + detail.setPrepareId(whiteOrder.getWorkorderCode() + "L"); detail.setMaterailName(planDetail.getMaterialName()); detail.setMaterialCode(planDetail.getMaterialCode()); detail.setProductDate(planDetail.getProductDate()); detail.setShiftId(planDetail.getShiftId() + ""); detail.setProdType("white"); detail.setFactoryCode(planDetail.getFactoryCode()); - } - details.add(detail); - proOrderWorkorderMapper.createPrepareDetails(details); + details.add(detail); + proOrderWorkorderMapper.createPrepareDetails(details); + ids.add(workorderId); + }else{ + //无湿料计划，下发不了 + } } else if (whiteOrder != null) {//成品的母工单回传sap sapList = new ArrayList<>(); SapCreateOrder sap = new SapCreateOrder(); @@ -292,11 +281,34 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } } + ids.add(workorderId); } } + if(!CollectionUtils.isEmpty(ids)){ + String[] idsArray = (String[])ids.toArray(new String[ids.size()]); + List workorders = proOrderWorkorderMapper.getWorkOrderByIds(idsArray); + for (ProOrderWorkorder workorder : workorders) { + //关联工艺 + if (StringUtils.isNotBlank(workorder.getRouteCode())) { + List workDetails = proWorkorderProcessDetailMapper.getWorkOrderDetailsByRouteCode(workorder); + if (!CollectionUtils.isEmpty(workDetails)) { + workDetails.forEach(str -> { + str.setRecordId(IdUtils.fastSimpleUUID()); + str.setWorkorderId(workorder.getWorkorderId()); + str.setStatus("s0");//未执行 + str.setCreateBy(SecurityContextHolder.getUserName()); + str.setCreateTime(DateUtils.getNowDate()); + str.setFactoryCode(workorder.getFactoryCode()); + }); + proWorkorderProcessDetailMapper.addWorkOrderDetails(workDetails); + } + } + } - //下达工单 - return proOrderWorkorderMapper.downProOrderWorkorderByWorkorderIds(workorderIds); + //下达工单 + return proOrderWorkorderMapper.downProOrderWorkorderByWorkorderIds(idsArray); + } + return 0; } // //获取最低级材料 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java index 41a6bbacc..8d7b9c5fb 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java @@ -215,6 +215,7 @@ public class ProWetMaterialPlanServiceImpl implements IProWetMaterialPlanService // 循环创建湿料计划详情 for (ProOrderWorkorder proOrderWorkorder : proOrderWorkorderList) { + // 将湿料计划详情更新至数据库 proWetMaterialPlanDetailMapper.insertProWetMaterialPlanDetail(createProWetMaterialPlanDetail(proOrderWorkorder, planId)); } diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index a65bfe668..754933b0a 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -50,12 +50,12 @@ From c55c71a0e405b11e361fe0e6f9fe876c7862ed5d Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Sep 2023 17:35:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=99=84=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseProductAttachedController.java | 97 +++++++ .../op/wms/domain/BaseProductAttached.java | 239 ++++++++++++++++++ .../wms/mapper/BaseProductAttachedMapper.java | 61 +++++ .../service/IBaseProductAttachedService.java | 60 +++++ .../impl/BaseProductAttachedServiceImpl.java | 86 +++++++ .../mapper/wms/BaseProductAttachedMapper.xml | 157 ++++++++++++ 6 files changed, 700 insertions(+) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductAttachedService.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java create mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java new file mode 100644 index 000000000..b087da5dd --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java @@ -0,0 +1,97 @@ +package com.op.wms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.wms.domain.BaseProductAttached; +import com.op.wms.service.IBaseProductAttachedService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 物料附属信息Controller + * + * @author Open Platform + * @date 2023-09-20 + */ +@RestController +@RequestMapping("/attached") +public class BaseProductAttachedController extends BaseController { + @Autowired + private IBaseProductAttachedService baseProductAttachedService; + + /** + * 查询物料附属信息列表 + */ + @RequiresPermissions("wms:attached:list") + @GetMapping("/list") + public TableDataInfo list(BaseProductAttached baseProductAttached) { + startPage(); + List list = baseProductAttachedService.selectBaseProductAttachedList(baseProductAttached); + return getDataTable(list); + } + + /** + * 导出物料附属信息列表 + */ + @RequiresPermissions("wms:attached:export") + @Log(title = "物料附属信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseProductAttached baseProductAttached) { + List list = baseProductAttachedService.selectBaseProductAttachedList(baseProductAttached); + ExcelUtil util = new ExcelUtil(BaseProductAttached.class); + util.exportExcel(response, list, "物料附属信息数据"); + } + + /** + * 获取物料附属信息详细信息 + */ + @RequiresPermissions("wms:attached:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(baseProductAttachedService.selectBaseProductAttachedById(id)); + } + + /** + * 新增物料附属信息 + */ + @RequiresPermissions("wms:attached:add") + @Log(title = "物料附属信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseProductAttached baseProductAttached) { + return toAjax(baseProductAttachedService.insertBaseProductAttached(baseProductAttached)); + } + + /** + * 修改物料附属信息 + */ + @RequiresPermissions("wms:attached:edit") + @Log(title = "物料附属信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseProductAttached baseProductAttached) { + return toAjax(baseProductAttachedService.updateBaseProductAttached(baseProductAttached)); + } + + /** + * 删除物料附属信息 + */ + @RequiresPermissions("wms:attached:remove") + @Log(title = "物料附属信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(baseProductAttachedService.deleteBaseProductAttachedByIds(ids)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java new file mode 100644 index 000000000..5da4dc642 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java @@ -0,0 +1,239 @@ +package com.op.wms.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 物料附属信息对象 base_product_attached + * + * @author Open Platform + * @date 2023-09-20 + */ +public class BaseProductAttached extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 产品编号 */ + @Excel(name = "产品编号") + private String productCode; + + /** 品类 */ + @Excel(name = "品类") + private String category; + + /** 每PC单圈 */ + @Excel(name = "每PC单圈") + private String pc; + + /** 标准效率 */ + @Excel(name = "标准效率") + private BigDecimal iei; + + /** 标准用人 */ + @Excel(name = "标准用人") + private BigDecimal manStandar; + + /** 喷药方式 */ + @Excel(name = "喷药方式") + private String sprayWay; + + /** 白坯直径 */ + @Excel(name = "白坯直径") + private BigDecimal blankDiameter; + + /** 白坯物料号 */ + @Excel(name = "白坯物料号") + private String blankNo; + + /** 标准喷药量（KG/PC） */ + @Excel(name = "标准喷药量", readConverterExp = "K=G/PC") + private BigDecimal sprayVolume; + + /** 药液料号 */ + @Excel(name = "药液料号") + private String liquidNo; + + /** 标准内膜用量（KG/PC） */ + @Excel(name = "标准内膜用量", readConverterExp = "K=G/PC") + private BigDecimal endometrialDosage; + + /** 标准外模用量(KG/PC) */ + @Excel(name = "标准外模用量(KG/PC)") + private BigDecimal outerFilmDosage; + + /** 支架 */ + @Excel(name = "支架") + private Long support; + + /** 支架物料号 */ + @Excel(name = "支架物料号") + private String supportNo; + + /** 吸塑 */ + @Excel(name = "吸塑") + private Long pvc; + + /** 支架盘 */ + @Excel(name = "支架盘") + private Long supportPlate; + + /** 其它 */ + @Excel(name = "其它") + private String other; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductCode() { + return productCode; + } + public void setCategory(String category) { + this.category = category; + } + + public String getCategory() { + return category; + } + public void setPc(String pc) { + this.pc = pc; + } + + public String getPc() { + return pc; + } + public void setIei(BigDecimal iei) { + this.iei = iei; + } + + public BigDecimal getIei() { + return iei; + } + public void setManStandar(BigDecimal manStandar) { + this.manStandar = manStandar; + } + + public BigDecimal getManStandar() { + return manStandar; + } + public void setSprayWay(String sprayWay) { + this.sprayWay = sprayWay; + } + + public String getSprayWay() { + return sprayWay; + } + public void setBlankDiameter(BigDecimal blankDiameter) { + this.blankDiameter = blankDiameter; + } + + public BigDecimal getBlankDiameter() { + return blankDiameter; + } + public void setBlankNo(String blankNo) { + this.blankNo = blankNo; + } + + public String getBlankNo() { + return blankNo; + } + public void setSprayVolume(BigDecimal sprayVolume) { + this.sprayVolume = sprayVolume; + } + + public BigDecimal getSprayVolume() { + return sprayVolume; + } + public void setLiquidNo(String liquidNo) { + this.liquidNo = liquidNo; + } + + public String getLiquidNo() { + return liquidNo; + } + public void setEndometrialDosage(BigDecimal endometrialDosage) { + this.endometrialDosage = endometrialDosage; + } + + public BigDecimal getEndometrialDosage() { + return endometrialDosage; + } + public void setOuterFilmDosage(BigDecimal outerFilmDosage) { + this.outerFilmDosage = outerFilmDosage; + } + + public BigDecimal getOuterFilmDosage() { + return outerFilmDosage; + } + public void setSupport(Long support) { + this.support = support; + } + + public Long getSupport() { + return support; + } + public void setSupportNo(String supportNo) { + this.supportNo = supportNo; + } + + public String getSupportNo() { + return supportNo; + } + public void setPvc(Long pvc) { + this.pvc = pvc; + } + + public Long getPvc() { + return pvc; + } + public void setSupportPlate(Long supportPlate) { + this.supportPlate = supportPlate; + } + + public Long getSupportPlate() { + return supportPlate; + } + public void setOther(String other) { + this.other = other; + } + + public String getOther() { + return other; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("productCode", getProductCode()) + .append("category", getCategory()) + .append("pc", getPc()) + .append("iei", getIei()) + .append("manStandar", getManStandar()) + .append("sprayWay", getSprayWay()) + .append("blankDiameter", getBlankDiameter()) + .append("blankNo", getBlankNo()) + .append("sprayVolume", getSprayVolume()) + .append("liquidNo", getLiquidNo()) + .append("endometrialDosage", getEndometrialDosage()) + .append("outerFilmDosage", getOuterFilmDosage()) + .append("support", getSupport()) + .append("supportNo", getSupportNo()) + .append("pvc", getPvc()) + .append("supportPlate", getSupportPlate()) + .append("other", getOther()) + .toString(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java new file mode 100644 index 000000000..14e2a6896 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java @@ -0,0 +1,61 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.op.wms.domain.BaseProductAttached; + +/** + * 物料附属信息Mapper接口 + * + * @author Open Platform + * @date 2023-09-20 + */ +public interface BaseProductAttachedMapper { + /** + * 查询物料附属信息 + * + * @param id 物料附属信息主键 + * @return 物料附属信息 + */ + public BaseProductAttached selectBaseProductAttachedById(String id); + + /** + * 查询物料附属信息列表 + * + * @param baseProductAttached 物料附属信息 + * @return 物料附属信息集合 + */ + public List selectBaseProductAttachedList(BaseProductAttached baseProductAttached); + + /** + * 新增物料附属信息 + * + * @param baseProductAttached 物料附属信息 + * @return 结果 + */ + public int insertBaseProductAttached(BaseProductAttached baseProductAttached); + + /** + * 修改物料附属信息 + * + * @param baseProductAttached 物料附属信息 + * @return 结果 + */ + public int updateBaseProductAttached(BaseProductAttached baseProductAttached); + + /** + * 删除物料附属信息 + * + * @param id 物料附属信息主键 + * @return 结果 + */ + public int deleteBaseProductAttachedById(String id); + + /** + * 批量删除物料附属信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseProductAttachedByIds(String[] ids); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductAttachedService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductAttachedService.java new file mode 100644 index 000000000..6dcdfcc3c --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductAttachedService.java @@ -0,0 +1,60 @@ +package com.op.wms.service; + +import java.util.List; +import com.op.wms.domain.BaseProductAttached; + +/** + * 物料附属信息Service接口 + * + * @author Open Platform + * @date 2023-09-20 + */ +public interface IBaseProductAttachedService { + /** + * 查询物料附属信息 + * + * @param id 物料附属信息主键 + * @return 物料附属信息 + */ + public BaseProductAttached selectBaseProductAttachedById(String id); + + /** + * 查询物料附属信息列表 + * + * @param baseProductAttached 物料附属信息 + * @return 物料附属信息集合 + */ + public List selectBaseProductAttachedList(BaseProductAttached baseProductAttached); + + /** + * 新增物料附属信息 + * + * @param baseProductAttached 物料附属信息 + * @return 结果 + */ + public int insertBaseProductAttached(BaseProductAttached baseProductAttached); + + /** + * 修改物料附属信息 + * + * @param baseProductAttached 物料附属信息 + * @return 结果 + */ + public int updateBaseProductAttached(BaseProductAttached baseProductAttached); + + /** + * 批量删除物料附属信息 + * + * @param ids 需要删除的物料附属信息主键集合 + * @return 结果 + */ + public int deleteBaseProductAttachedByIds(String[] ids); + + /** + * 删除物料附属信息信息 + * + * @param id 物料附属信息主键 + * @return 结果 + */ + public int deleteBaseProductAttachedById(String id); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java new file mode 100644 index 000000000..d18a6c8b2 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java @@ -0,0 +1,86 @@ +package com.op.wms.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.wms.mapper.BaseProductAttachedMapper; +import com.op.wms.domain.BaseProductAttached; +import com.op.wms.service.IBaseProductAttachedService; + +/** + * 物料附属信息Service业务层处理 + * + * @author Open Platform + * @date 2023-09-20 + */ +@Service +public class BaseProductAttachedServiceImpl implements IBaseProductAttachedService { + @Autowired + private BaseProductAttachedMapper baseProductAttachedMapper; + + /** + * 查询物料附属信息 + * + * @param id 物料附属信息主键 + * @return 物料附属信息 + */ + @Override + public BaseProductAttached selectBaseProductAttachedById(String id) { + return baseProductAttachedMapper.selectBaseProductAttachedById(id); + } + + /** + * 查询物料附属信息列表 + * + * @param baseProductAttached 物料附属信息 + * @return 物料附属信息 + */ + @Override + public List selectBaseProductAttachedList(BaseProductAttached baseProductAttached) { + return baseProductAttachedMapper.selectBaseProductAttachedList(baseProductAttached); + } + + /** + * 新增物料附属信息 + * + * @param baseProductAttached 物料附属信息 + * @return 结果 + */ + @Override + public int insertBaseProductAttached(BaseProductAttached baseProductAttached) { + return baseProductAttachedMapper.insertBaseProductAttached(baseProductAttached); + } + + /** + * 修改物料附属信息 + * + * @param baseProductAttached 物料附属信息 + * @return 结果 + */ + @Override + public int updateBaseProductAttached(BaseProductAttached baseProductAttached) { + return baseProductAttachedMapper.updateBaseProductAttached(baseProductAttached); + } + + /** + * 批量删除物料附属信息 + * + * @param ids 需要删除的物料附属信息主键 + * @return 结果 + */ + @Override + public int deleteBaseProductAttachedByIds(String[] ids) { + return baseProductAttachedMapper.deleteBaseProductAttachedByIds(ids); + } + + /** + * 删除物料附属信息信息 + * + * @param id 物料附属信息主键 + * @return 结果 + */ + @Override + public int deleteBaseProductAttachedById(String id) { + return baseProductAttachedMapper.deleteBaseProductAttachedById(id); + } +} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml new file mode 100644 index 000000000..a0ccdfbd1 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, support_plate, other from base_product_attached + + + + + + + + insert into base_product_attached + + id, + product_code, + category, + pc, + iei, + man_standar, + spray_way, + blank_diameter, + blank_no, + spray_volume, + liquid_no, + endometrial_dosage, + outer_film_dosage, + support, + support_no, + pvc, + support_plate, + other, + + + #{id}, + #{productCode}, + #{category}, + #{pc}, + #{iei}, + #{manStandar}, + #{sprayWay}, + #{blankDiameter}, + #{blankNo}, + #{sprayVolume}, + #{liquidNo}, + #{endometrialDosage}, + #{outerFilmDosage}, + #{support}, + #{supportNo}, + #{pvc}, + #{supportPlate}, + #{other}, + + + + + update base_product_attached + + product_code = #{productCode}, + category = #{category}, + pc = #{pc}, + iei = #{iei}, + man_standar = #{manStandar}, + spray_way = #{sprayWay}, + blank_diameter = #{blankDiameter}, + blank_no = #{blankNo}, + spray_volume = #{sprayVolume}, + liquid_no = #{liquidNo}, + endometrial_dosage = #{endometrialDosage}, + outer_film_dosage = #{outerFilmDosage}, + support = #{support}, + support_no = #{supportNo}, + pvc = #{pvc}, + support_plate = #{supportPlate}, + other = #{other}, + + where id = #{id} + + + + delete from base_product_attached where id = #{id} + + + + delete from base_product_attached where id in + + #{id} + + + \ No newline at end of file