From 12a3e92039c7b513a9e53f67fee96bdc309479b9 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Mon, 8 Dec 2025 15:24:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=A5=E5=BA=93=E5=AD=90?= =?UTF-8?q?=E5=8D=95=E5=92=8C=E4=B8=BB=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/ToErpApiController.java | 7 + ...Param.java => ErpStockinConFirmParam.java} | 2 +- .../domain/erp/ErpStockinDetailResponse.java | 14 ++ ...StockinParam.java => ErpStockinParam.java} | 16 +-- .../api/domain/erp/ErpStockinResponse.java | 21 +++ .../com/ruoyi/api/service/IToErpService.java | 4 + .../api/service/impl/ToErpServiceImpl.java | 135 +++++++++++++++++- .../controller/ErpInStockinController.java | 6 +- .../in/ErpInStockin/domain/ErpInStockin.java | 3 + .../mapper/ErpInStockinMapper.java | 24 ++-- .../service/IErpInStockinService.java | 24 ++-- .../service/impl/ErpInStockinServiceImpl.java | 33 +++-- .../domain/ErpInStockinDetail.java | 16 +++ .../service/impl/InStockinServiceImpl.java | 4 - .../mapper/in/ErpInStockinMapper.xml | 36 +++-- 15 files changed, 290 insertions(+), 55 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/{StockinConFirmParam.java => ErpStockinConFirmParam.java} (96%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinDetailResponse.java rename ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/{StockinParam.java => ErpStockinParam.java} (87%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinResponse.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java index 1110eb7..cadbb9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java @@ -1,5 +1,6 @@ package com.ruoyi.api.controller; +import com.ruoyi.api.domain.erp.ErpStockinParam; import com.ruoyi.api.service.IToErpService; import com.ruoyi.bas.BasCustomer.domain.BasCustomer; import com.ruoyi.bas.BasProduct.domain.BasProduct; @@ -55,4 +56,10 @@ public class ToErpApiController { toErpService.login(); return AjaxResult.success(); } + + @PostMapping("/qqq") + public AjaxResult qqq() { + ErpStockinParam p=new ErpStockinParam(); + return toErpService.getStockinList(p); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinConFirmParam.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinConFirmParam.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinConFirmParam.java rename to ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinConFirmParam.java index 39d2c07..eb7e8bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinConFirmParam.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinConFirmParam.java @@ -9,7 +9,7 @@ import java.util.List; * 入库确认请求参数 */ @Data -public class StockinConFirmParam { +public class ErpStockinConFirmParam { /** * 单据ID（整数，如 0 表示新单） diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinDetailResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinDetailResponse.java new file mode 100644 index 0000000..cca5dec --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinDetailResponse.java @@ -0,0 +1,14 @@ +package com.ruoyi.api.domain.erp; + +import cn.hutool.core.annotation.Alias; +import lombok.Data; + +import java.util.List; + +@Data +public class ErpStockinDetailResponse { + @Alias("Clos") + private List cols; + @Alias("Rows") + private List> rows; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinParam.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinParam.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinParam.java rename to ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinParam.java index 9bc8546..13873a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinParam.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinParam.java @@ -4,15 +4,13 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - /** * 获取入库单据列表 */ @Data @NoArgsConstructor @AllArgsConstructor -public class StockinParam { +public class ErpStockinParam { /** * 过滤条件：申请开始时间（格式：yyyy-MM-dd HH:mm:ss） @@ -37,17 +35,17 @@ public class StockinParam { /** * 过滤条件：入库类别（字典值，如 1=采购入库, 2=生产入库...） */ - private Integer sort1; + private Integer sort1 = 0; /** * 过滤条件：入库状态（0=全部, 1=待入库, 2=已入库, 3=已取消...） */ - private Integer complete1; + private Integer complete1 = 1; /** * 过滤条件：入库主题（模糊匹配） */ - private String title; + private String title = "冷"; /** * 过滤条件：入库编号（精确匹配，如 RK_2025120501） @@ -77,16 +75,16 @@ public class StockinParam { /** * 过滤条件：是否返回明细信息（0=否，1=是） */ - private Integer needList; + private Integer needList = 1; /** * 每页返回数据行数（默认 20） */ - private Integer pageSize; + private Integer pageSize = 20; /** * 从第几页开始返回（默认 1，即第一页） */ - private Integer pageIndex; + private Integer pageIndex = 1; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinResponse.java new file mode 100644 index 0000000..dd40108 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/ErpStockinResponse.java @@ -0,0 +1,21 @@ +package com.ruoyi.api.domain.erp; + +import cn.hutool.core.annotation.Alias; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +public class ErpStockinResponse { + + @Alias("Page") + private Page page; + @Alias("Cols") + private List cols; + @Alias("Rows") + private List> rows; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java index 4236fea..e999610 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java @@ -1,5 +1,6 @@ package com.ruoyi.api.service; +import com.ruoyi.api.domain.erp.ErpStockinParam; import com.ruoyi.api.domain.erp.ReceiveOutStockConfirm; import com.ruoyi.bas.BasCustomer.domain.BasCustomer; import com.ruoyi.bas.BasProduct.domain.BasProduct; @@ -28,4 +29,7 @@ public interface IToErpService { AjaxResult callErp(ReceiveOutStockConfirm receiveOutStockConfirm); AjaxResult receiveOutStockList(); + + + AjaxResult getStockinList(ErpStockinParam erpStockinParam); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 3d7e34a..2b34a4a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjUtil; import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; @@ -18,7 +19,10 @@ import com.ruoyi.bas.BasSupplier.domain.BasSupplier; import com.ruoyi.bas.BasSupplier.service.IBasSupplierService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.uuid.UUID; +import com.ruoyi.in.ErpInStockin.domain.ErpInStockin; +import com.ruoyi.in.ErpInStockin.service.IErpInStockinService; +import com.ruoyi.in.ErpInStockinDetail.domain.ErpInStockinDetail; +import com.ruoyi.in.ErpInStockinDetail.service.IErpInStockinDetailService; import com.ruoyi.out.ErpOutStock.domain.ErpOutStock; import com.ruoyi.out.OutStockMiddle.domain.OutStockMiddle; import com.ruoyi.out.ErpOutStockDetail.domain.ErpOutStockDetail; @@ -29,8 +33,8 @@ import com.ruoyi.out.outStockout.service.IOutStockoutService; import com.ruoyi.out.OutStockMiddle.service.IOutStockMiddleService; import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail; -import com.ruoyi.out.ErpOutStockDetail.service.IErpOutStockDetailService; import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +45,7 @@ import java.util.concurrent.TimeUnit; /** * 作业统计 Service 实现 */ +@Slf4j @Service public class ToErpServiceImpl implements IToErpService { @@ -65,6 +70,12 @@ public class ToErpServiceImpl implements IToErpService { @Autowired private IOutStockoutDetailService outStockoutDetailService; + @Autowired + private IErpInStockinService erpInStockinService; + + @Autowired + private IErpInStockinDetailService erpInStockinDetailService; + @Autowired private IBasJobIdService basJobIdService; @@ -86,6 +97,10 @@ public class ToErpServiceImpl implements IToErpService { private static final String outStockListUrl = erpUrl+"/webapi/v3/store/KuOutApplyList"; private static final String outStockConfirmUrl = erpUrl+"/webapi/v3/store/KuOutApplyEdit/edit"; + private static final String getStockinListUrl = erpUrl+"/webapi/v3/store/KuInApplyList"; + private static final String stockinConfirmUrl = erpUrl+"/webapi/v3/store/KuInApplyEdit/edit"; + + @Override public Map saveTransferBill() { @@ -392,4 +407,120 @@ public class ToErpServiceImpl implements IToErpService { return AjaxResult.error(callErpResponse.getMsg()); } } + + + /** + * 请求入库单列表 + * + * @param erpStockinParam + * @return + */ + public AjaxResult getStockinList(ErpStockinParam erpStockinParam){ + + erpStockinParam = new ErpStockinParam(); + + //测试 + erpStockinParam.setTitle(""); +// erpStockinParam.setNeedList(0); + + //获取请求参数 + String requestSession = login(); + String response = HttpRequest.post(getStockinListUrl) + .header(TOKEN_KEY,requestSession) + .body(JSONUtil.toJsonStr(erpStockinParam)) + .execute() + .body(); + + //处理响应信息 + try { + ErpStockinResponse res = JSONUtil.toBean(response, ErpStockinResponse.class); + for (List list : res.getRows()) { + //获取入库主单参数 + ErpInStockin erpInStockin = new ErpInStockin(); + erpInStockin.setTitle(Convert.toStr(list.get(0))); + erpInStockin.setKuin(Convert.toStr(list.get(1))); + erpInStockin.setComplete1(Convert.toStr(list.get(2))); + erpInStockin.setCateid(Convert.toStr(list.get(3))); + erpInStockin.setDate3(Convert.toStr(list.get(4))); + erpInStockin.setDate5(Convert.toStr(list.get(5))); + erpInStockin.setCatein(Convert.toStr(list.get(6))); + erpInStockin.setIntro2(Convert.toStr(list.get(7))); + erpInStockin.setIntro(Convert.toStr(list.get(8))); + erpInStockin.setCaigou(Convert.toStr(list.get(9))); + erpInStockin.setDate7(Convert.toStr(list.get(10))); + erpInStockin.setKg(Convert.toStr(list.get(11))); + erpInStockin.setSort1(Convert.toStr(list.get(12))); + erpInStockin.setRkbh(Convert.toStr(list.get(13))); + erpInStockin.setStatus(Convert.toStr(list.get(14))); + //todo 入库单明细长度？ + erpInStockin.setKuinList(Convert.toStr(list.get(15))); + erpInStockin.setSysIcusIInheritIdIidI413(Convert.toStr(list.get(16))); + erpInStockin.setSysIcusIInheritIdIidI414(Convert.toStr(list.get(17))); + erpInStockin.setSysIcusIInheritIdIidI415(Convert.toStr(list.get(18))); + erpInStockin.setStockinGuid(UUID.randomUUID().toString()); + + //校验单据是否已经在表中 - 新增/更新 + if (ObjUtil.isNotNull(erpInStockinService.selectErpInStockinByKuin(erpInStockin.getKuin()))) { + erpInStockinService.updateErpInStockin(erpInStockin); + }else{ + erpInStockinService.insertErpInStockin(erpInStockin); + } + +//======================================================================================================================================== + + //根据主单【kuinlist】字段获取子单信息 + if (erpStockinParam.getNeedList() == 1) { + + //获取子单明细 + JSONObject jsonObject = JSONUtil.parseObj(erpInStockin.getKuinList()); + jsonObject.get("rows"); + ErpStockinDetailResponse resDetail = JSONUtil.toBean(erpInStockin.getKuinList(), ErpStockinDetailResponse.class); + + //生成子单信息 + for (List details : resDetail.getRows()){ + //获取入库子单数据 + ErpInStockinDetail erpInStockinDetail = new ErpInStockinDetail(); + erpInStockinDetail.setId(Convert.toLong(details.get(0)));//明细id + erpInStockinDetail.setQuantity(Convert.toLong(details.get(9)));//入库数量 + erpInStockinDetail.setAssistUnit(Convert.toLong(details.get(5)));//辅助单位 + erpInStockinDetail.setAssistQuantity(Convert.toLong(details.get(9)));//辅助数量 + erpInStockinDetail.setWarehousePositionID(0L);//货位 + erpInStockinDetail.setKu(0L);//库区 + erpInStockinDetail.setPh(Convert.toStr(details.get(17)));//批号 + erpInStockinDetail.setPh(Convert.toStr(details.get(18)));//序列号 + erpInStockinDetail.setPh(Convert.toStr(details.get(19)));//生产日期 + erpInStockinDetail.setPh(Convert.toStr(details.get(20)));//有效日期 + erpInStockinDetail.setPh(Convert.toStr(details.get(21)));//到货日期 + erpInStockinDetail.setPh(Convert.toStr(details.get(29)));//装卸工 + erpInStockinDetail.setSpare1(Convert.toStr(details.get(1)));//产品名称 - product_name + erpInStockinDetail.setSpare2(Convert.toStr(details.get(2)));//产品型号 - product_id + + //关联主单 + erpInStockinDetail.setKuin(erpInStockin.getKuin());//入库id + erpInStockinDetail.setRkbh(erpInStockin.getRkbh());//入库编号 + + //校验数据是否已经在表中 - 新增/更新 + if (ObjUtil.isNotNull(erpInStockinDetailService.selectErpInStockinDetailById(erpInStockinDetail.getId()))) { + erpInStockinDetailService.updateErpInStockinDetail(erpInStockinDetail); + }else{ + erpInStockinDetailService.insertErpInStockinDetail(erpInStockinDetail); + } + } + }else { + log.info("请求未获取子单详情【needList:0】"); + } + + } + }catch(Exception e){ + log.error("请求异常:" + e.getMessage()); + return AjaxResult.error(); + } + + return AjaxResult.success(); + } + + + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java index 3a10265..0eb8819 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java @@ -66,7 +66,7 @@ public class ErpInStockinController extends BaseController @GetMapping(value = "/{title}") public AjaxResult getInfo(@PathVariable("title") String title) { - return success(erpInStockinService.selectErpInStockinByTitle(title)); + return success(erpInStockinService.selectErpInStockinByKuin(title)); } /** @@ -97,8 +97,8 @@ public class ErpInStockinController extends BaseController @PreAuthorize("@ss.hasPermi('in:ErpInStockin:remove')") @Log(title = "入库主表单", businessType = BusinessType.DELETE) @DeleteMapping("/{titles}") - public AjaxResult remove(@PathVariable String[] titles) + public AjaxResult remove(@PathVariable String[] kuins) { - return toAjax(erpInStockinService.deleteErpInStockinByTitles(titles)); + return toAjax(erpInStockinService.deleteErpInStockinByKuins(kuins)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java index b75245e..95d27ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java @@ -1,5 +1,7 @@ package com.ruoyi.in.ErpInStockin.domain; +import cn.hutool.core.annotation.Alias; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,6 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-12-08 */ +@Data public class ErpInStockin extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java index b6bb6a7..dc827b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java @@ -14,10 +14,10 @@ public interface ErpInStockinMapper /** * 查询入库主表单 * - * @param title 入库主表单主键 + * @param kuin 入库主表单主键 * @return 入库主表单 */ - public ErpInStockin selectErpInStockinByTitle(String title); + public ErpInStockin selectErpInStockinByKuin(String kuin); /** * 查询入库主表单列表 @@ -44,18 +44,26 @@ public interface ErpInStockinMapper public int updateErpInStockin(ErpInStockin erpInStockin); /** - * 删除入库主表单 - * - * @param title 入库主表单主键 + * 插入/修改入库主表单 + * + * @param erpInStockin 入库主表单 * @return 结果 */ - public int deleteErpInStockinByTitle(String title); + public int upsertErpInStockin(ErpInStockin erpInStockin); + + /** + * 删除入库主表单 + * + * @param kuin 入库主表单主键 + * @return 结果 + */ + public int deleteErpInStockinByKuin(String kuin); /** * 批量删除入库主表单 * - * @param titles 需要删除的数据主键集合 + * @param kuins 需要删除的数据主键集合 * @return 结果 */ - public int deleteErpInStockinByTitles(String[] titles); + public int deleteErpInStockinByKuins(String[] kuins); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java index 55bccb2..862ce4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java @@ -14,10 +14,10 @@ public interface IErpInStockinService /** * 查询入库主表单 * - * @param title 入库主表单主键 + * @param kuin 入库主表单主键 * @return 入库主表单 */ - public ErpInStockin selectErpInStockinByTitle(String title); + public ErpInStockin selectErpInStockinByKuin(String kuin); /** * 查询入库主表单列表 @@ -44,18 +44,26 @@ public interface IErpInStockinService public int updateErpInStockin(ErpInStockin erpInStockin); /** - * 批量删除入库主表单 - * - * @param titles 需要删除的入库主表单主键集合 + * 插入/修改入库主表单 + * + * @param erpInStockin 入库主表单 * @return 结果 */ - public int deleteErpInStockinByTitles(String[] titles); + public int upsertErpInStockin(ErpInStockin erpInStockin); + + /** + * 批量删除入库主表单 + * + * @param kuins 需要删除的入库主表单主键集合 + * @return 结果 + */ + public int deleteErpInStockinByKuins(String[] kuins); /** * 删除入库主表单信息 * - * @param title 入库主表单主键 + * @param kuin 入库主表单主键 * @return 结果 */ - public int deleteErpInStockinByTitle(String title); + public int deleteErpInStockinByKuin(String kuin); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java index 74c2dff..0221ccf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java @@ -22,13 +22,13 @@ public class ErpInStockinServiceImpl implements IErpInStockinService /** * 查询入库主表单 * - * @param title 入库主表单主键 + * @param stockinId 入库主表单主键 * @return 入库主表单 */ @Override - public ErpInStockin selectErpInStockinByTitle(String title) + public ErpInStockin selectErpInStockinByKuin(String stockinId) { - return erpInStockinMapper.selectErpInStockinByTitle(title); + return erpInStockinMapper.selectErpInStockinByKuin(stockinId); } /** @@ -68,26 +68,37 @@ public class ErpInStockinServiceImpl implements IErpInStockinService } /** - * 批量删除入库主表单 - * - * @param titles 需要删除的入库主表单主键 + * 插入/修改入库主表单 + * + * @param erpInStockin 入库主表单 * @return 结果 */ @Override - public int deleteErpInStockinByTitles(String[] titles) + public int upsertErpInStockin(ErpInStockin erpInStockin) { - return erpInStockinMapper.deleteErpInStockinByTitles(titles); + return erpInStockinMapper.upsertErpInStockin(erpInStockin); + } + /** + * 批量删除入库主表单 + * + * @param stockinIds 需要删除的入库主表单主键 + * @return 结果 + */ + @Override + public int deleteErpInStockinByKuins(String[] kuins) + { + return erpInStockinMapper.deleteErpInStockinByKuins(kuins); } /** * 删除入库主表单信息 * - * @param title 入库主表单主键 + * @param stockinId 入库主表单主键 * @return 结果 */ @Override - public int deleteErpInStockinByTitle(String title) + public int deleteErpInStockinByKuin(String kuin) { - return erpInStockinMapper.deleteErpInStockinByTitle(title); + return erpInStockinMapper.deleteErpInStockinByKuin(kuin); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java index 01668de..ba0a90c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java @@ -1,5 +1,7 @@ package com.ruoyi.in.ErpInStockinDetail.domain; +import cn.hutool.core.annotation.Alias; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,6 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-12-08 */ +@Data public class ErpInStockinDetail extends BaseEntity { private static final long serialVersionUID = 1L; @@ -70,6 +73,19 @@ public class ErpInStockinDetail extends BaseEntity @Excel(name = "入库编号", readConverterExp = "关=联主单") private String rkbh; + /** + * 产品类型 - product_name + */ + private String spare1; + /** + * 产品型号 - product_id + */ + private String spare2; + private String spare3; + private String spare4; + private String spare5; + + public void setId(Long id) { this.id = id; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java index 624d86f..de2886a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java @@ -1,17 +1,13 @@ package com.ruoyi.in.stockin.service.impl; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetail.service.IInStockinDetailService; -import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.in.stockin.mapper.InStockinMapper; diff --git a/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMapper.xml index 912cda3..cfe24f6 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMapper.xml @@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where title = #{title} + where kuin = #{kuin} @@ -133,17 +133,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysIcusIInheritIdIidI415 = #{sysIcusIInheritIdIidI415}, stockin_guid = #{stockinGuid}, - where title = #{title} + where kuin = #{kuin} - - delete from erp_in_stockin where title = #{title} + +-- MERGE erp_in_stockin as tar +-- USING ( +-- SELECT +-- job_id, +-- status, +-- on_line_type, +-- task_no, +-- tray_code, +-- cargo_space_id, +-- execution_phase, +-- create_time +-- FROM mydo_job +-- WHERE status = 0 +-- ) as src +-- ON tar.stockin_id = src.stockin_id + + + + delete from erp_in_stockin where kuin = #{kuin} - - delete from erp_in_stockin where title in - - #{title} + + delete from erp_in_stockin where kuin in + + #{kuin} \ No newline at end of file