diff --git a/src/main/java/com/gaotao/modules/boxManage/controller/BoxForNotificationController.java b/src/main/java/com/gaotao/modules/boxManage/controller/BoxForNotificationController.java index 75c0dbf..32b4ba6 100644 --- a/src/main/java/com/gaotao/modules/boxManage/controller/BoxForNotificationController.java +++ b/src/main/java/com/gaotao/modules/boxManage/controller/BoxForNotificationController.java @@ -1,6 +1,7 @@ package com.gaotao.modules.boxManage.controller; import com.gaotao.common.utils.R; +import com.gaotao.modules.boxManage.data.SoReceiveBoxRollsData; import com.gaotao.modules.boxManage.data.SoReceiveBoxesData; import com.gaotao.modules.boxManage.service.BoxForNotificationService; import org.springframework.beans.factory.annotation.Autowired; @@ -39,8 +40,22 @@ public class BoxForNotificationController { @PostMapping(value="/newSoReceiveBoxesData") @ResponseBody public R newSoReceiveBoxesData(@RequestBody SoReceiveBoxesData data) { - srmSupplierService.newSoReceiveBoxesData(data); - return R.ok(); + String result= srmSupplierService.newSoReceiveBoxesData(data); + return R.ok().put("boxNo", result); } + /** + * + * @description 查项箱数据和箱明细 + * @author 常熟吴彦祖 + * @date 2025/9/2 17:38 + * @return R + */ + @PostMapping(value="/searchBoxDetail") + @ResponseBody + public R searchBoxDetail(@RequestBody SoReceiveBoxesData data) { + List rows = srmSupplierService.searchBoxRollDetail(data); + SoReceiveBoxesData row = srmSupplierService.searchBoxData(data); + return R.ok().put("rows", rows).put("row", row); + } } diff --git a/src/main/java/com/gaotao/modules/boxManage/dao/BoxForNotificationMapper.java b/src/main/java/com/gaotao/modules/boxManage/dao/BoxForNotificationMapper.java index b358695..d79dd46 100644 --- a/src/main/java/com/gaotao/modules/boxManage/dao/BoxForNotificationMapper.java +++ b/src/main/java/com/gaotao/modules/boxManage/dao/BoxForNotificationMapper.java @@ -1,5 +1,6 @@ package com.gaotao.modules.boxManage.dao; +import com.gaotao.modules.boxManage.data.SoReceiveBoxRollsData; import com.gaotao.modules.boxManage.data.SoReceiveBoxesData; import org.apache.ibatis.annotations.Mapper; @@ -11,4 +12,8 @@ public interface BoxForNotificationMapper { List searchSoReceiveBoxesData(SoReceiveBoxesData data); void newSoReceiveBoxesData(SoReceiveBoxesData data); + + List searchBoxRollDetail(SoReceiveBoxesData data); + + SoReceiveBoxesData searchBoxData(SoReceiveBoxesData data); } diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveBoxRollsData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveBoxRollsData.java new file mode 100644 index 0000000..71fbccc --- /dev/null +++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveBoxRollsData.java @@ -0,0 +1,12 @@ +package com.gaotao.modules.boxManage.data; + + +import com.gaotao.modules.boxManage.entity.SoReceiveBoxRolls; +import lombok.Data; +import org.apache.ibatis.type.Alias; + +@Data +@Alias("SoReceiveBoxRollsData") +public class SoReceiveBoxRollsData extends SoReceiveBoxRolls { + +} diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveBoxRolls.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveBoxRolls.java new file mode 100644 index 0000000..2d69000 --- /dev/null +++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveBoxRolls.java @@ -0,0 +1,141 @@ +package com.gaotao.modules.boxManage.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +public class SoReceiveBoxRolls { + /** + * + */ + private Integer id; + + /** + * + */ + private String site; + + /** + * + */ + private String buNo; + + /** + * + */ + private String boxNo; + + /** + * + */ + private String finalRollNo; + + /** + * + */ + private BigDecimal rollQty; + + /** + * + */ + private String receivedBy; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date receivedDate; + + /** + * + */ + private String wareHouseID; + + /** + * + */ + private String partNo; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getBuNo() { + return buNo; + } + + public void setBuNo(String buNo) { + this.buNo = buNo; + } + + public String getBoxNo() { + return boxNo; + } + + public void setBoxNo(String boxNo) { + this.boxNo = boxNo; + } + + public String getFinalRollNo() { + return finalRollNo; + } + + public void setFinalRollNo(String finalRollNo) { + this.finalRollNo = finalRollNo; + } + + public BigDecimal getRollQty() { + return rollQty; + } + + public void setRollQty(BigDecimal rollQty) { + this.rollQty = rollQty; + } + + public String getReceivedBy() { + return receivedBy; + } + + public void setReceivedBy(String receivedBy) { + this.receivedBy = receivedBy; + } + + public Date getReceivedDate() { + return receivedDate; + } + + public void setReceivedDate(Date receivedDate) { + this.receivedDate = receivedDate; + } + + public String getWareHouseID() { + return wareHouseID; + } + + public void setWareHouseID(String wareHouseID) { + this.wareHouseID = wareHouseID; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } +} \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/boxManage/service/BoxForNotificationService.java b/src/main/java/com/gaotao/modules/boxManage/service/BoxForNotificationService.java index dfcdc3d..f455011 100644 --- a/src/main/java/com/gaotao/modules/boxManage/service/BoxForNotificationService.java +++ b/src/main/java/com/gaotao/modules/boxManage/service/BoxForNotificationService.java @@ -1,10 +1,15 @@ package com.gaotao.modules.boxManage.service; +import com.gaotao.modules.boxManage.data.SoReceiveBoxRollsData; import com.gaotao.modules.boxManage.data.SoReceiveBoxesData; import java.util.List; public interface BoxForNotificationService { List searchSoReceiveBoxesData(SoReceiveBoxesData data); - void newSoReceiveBoxesData(SoReceiveBoxesData data); + String newSoReceiveBoxesData(SoReceiveBoxesData data); + + List searchBoxRollDetail(SoReceiveBoxesData data); + + SoReceiveBoxesData searchBoxData(SoReceiveBoxesData data); } diff --git a/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java b/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java index 6e59d5b..978aea0 100644 --- a/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java @@ -1,6 +1,7 @@ package com.gaotao.modules.boxManage.service.impl; import com.gaotao.modules.boxManage.dao.BoxForNotificationMapper; +import com.gaotao.modules.boxManage.data.SoReceiveBoxRollsData; import com.gaotao.modules.boxManage.data.SoReceiveBoxesData; import com.gaotao.modules.boxManage.service.BoxForNotificationService; import com.gaotao.modules.trans.entity.TransNoControl; @@ -11,7 +12,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class BoxForNotificationServiceImpl implements BoxForNotificationService { +public class BoxForNotificationServiceImpl implements BoxForNotificationService { @Autowired private TransNoControlService transNoService; @Autowired @@ -23,12 +24,23 @@ public class BoxForNotificationServiceImpl implements BoxForNotificationService @Override - public void newSoReceiveBoxesData(SoReceiveBoxesData inData){ + public String newSoReceiveBoxesData(SoReceiveBoxesData inData){ TransNoControl transNo = transNoService.getTransNo(inData.getSite(),"BOX",inData.getBuNo()); if(transNo == null){ throw new RuntimeException("箱号生成失败，请联系管理员!"); } inData.setBoxNo(transNo.getNewTransNo()); boxForNotificationMapper.newSoReceiveBoxesData(inData); + return transNo.getNewTransNo(); + } + + @Override + public List searchBoxRollDetail(SoReceiveBoxesData inData){ + return boxForNotificationMapper.searchBoxRollDetail(inData); + } + + @Override + public SoReceiveBoxesData searchBoxData(SoReceiveBoxesData data){ + return boxForNotificationMapper.searchBoxData(data); } } diff --git a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml index 0b31ed1..5b73c32 100644 --- a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml +++ b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml @@ -48,4 +48,17 @@ + + + + \ No newline at end of file