From 84cbd611dcd99a904e070671e899408e13ed0532 Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Mon, 24 Mar 2025 19:28:03 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=9C=AA=E5=85=A5=E8=B4=A6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaterialPackingController.java | 48 +++++++++++++++++++ .../idm/model/MaterialNotPostedRequest.java | 24 ++++++++++ 2 files changed, 72 insertions(+) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java new file mode 100644 index 0000000..dc89253 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java @@ -0,0 +1,48 @@ +package com.cim.idm.controller; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.cim.idm.model.*; +import com.cim.idm.utils.AjaxResult; +import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy; +import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.web.bind.annotation.*; + +import java.sql.Timestamp; +import java.util.*; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/packing") +@EnableAutoConfiguration +public class MaterialPackingController { + + /** + * 更新未入账 + */ + @PostMapping(value = "/update") + public AjaxResult update(@RequestBody JSONObject in) { + MaterialNotPostedRequest sl = JSON.toJavaObject(in, MaterialNotPostedRequest.class); + // 获取数据 + List collect = sl.getDataList().stream().map(item -> { + MaterialPackingKey packingKey = new MaterialPackingKey(); + packingKey.setSiteName(item.getSiteName()); + packingKey.setMaterialPackingName(item.getMaterialPackingName()); + return packingKey; + }).collect(Collectors.toList()); + List materialPackings = + MaterialPackingServiceProxy.getMaterialPackingService().selectByKey(collect); + // 修改 + for (com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking materialPacking : materialPackings) { + // 批次号 + materialPacking.setCharge(sl.getCHARGE()); + // 保质期 + materialPacking.setExpiringDate(Timestamp.valueOf(sl.getEXPIRNGDATE())); + // 制造日期 + materialPacking.setMakeDate(Timestamp.valueOf(sl.getMAKEDATE())); + } + MaterialPackingServiceProxy.getMaterialPackingService().update(materialPackings); + return AjaxResult.me().setSuccess(true).setMessage("过账成功"); + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java b/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java new file mode 100644 index 0000000..fd2819c --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java @@ -0,0 +1,24 @@ +package com.cim.idm.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class MaterialNotPostedRequest { + + // 批次 + private String CHARGE; + + // 保质期 + private String EXPIRNGDATE; + + // 制造日期 + private String MAKEDATE; + + // 规格 + private String SITENAME; + + // 数据 + private List dataList; +}