diff --git a/src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStock.java b/src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStock.java index a44c722..e3bf020 100644 --- a/src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStock.java +++ b/src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStock.java @@ -1,12 +1,15 @@ package com.gaotao.modules.inventoryStock.entity; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gaotao.common.utils.QueryPage; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @Data -public class InventoryStock { +public class InventoryStock extends QueryPage { private String site; private String buNo; private String rollNo; @@ -20,9 +23,17 @@ public class InventoryStock { private String wdr; private String statusTb; private String status; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date firstInDate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date latestOutDate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date latestInDate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date activeDate; private BigDecimal inQty; private BigDecimal outQty; @@ -34,10 +45,16 @@ public class InventoryStock { private BigDecimal outActualValue; private String partnerId; private String partnerType; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date latestCountDate; private String freezeFlag; private BigDecimal qtyTmp; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date manufactureDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date expiredDate; private BigDecimal qtyToIssue; private String orderref0; diff --git a/src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStockOutData.java b/src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStockOutData.java new file mode 100644 index 0000000..50e5c47 --- /dev/null +++ b/src/main/java/com/gaotao/modules/inventoryStock/entity/InventoryStockOutData.java @@ -0,0 +1,14 @@ +package com.gaotao.modules.inventoryStock.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import org.apache.ibatis.type.Alias; + +@Data +@Alias("InventoryStockOutData") +public class InventoryStockOutData extends InventoryStock { + + private String partDescription; + private String partDescEn; + +} diff --git a/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java b/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java index 10b7780..28644c2 100644 --- a/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java +++ b/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java @@ -2,6 +2,7 @@ package com.gaotao.modules.wms.controller; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; +import com.gaotao.modules.inventoryStock.entity.InventoryStockOutData; import com.gaotao.modules.toolman.entity.ToolHeader; import com.gaotao.modules.toolman.query.ToolHeaderQuery; import com.gaotao.modules.wms.data.InboundQcResultData; @@ -87,4 +88,17 @@ public class WmsPrintController { List rows = wmsPrintService.getPoPartLabelData( inList); return R.ok().put("rows", rows); } + + /** + * + * @description 库存标签数据 + * @author 常熟吴彦祖 + * @date 2025/8/20 14:00 + * @return R + */ + @PostMapping("getKuCunLabelData") + public R getKuCunLabelData(@RequestBody InventoryStockOutData inData){ + PageUtils page = wmsPrintService.getKuCunLabelData( inData); + return R.ok().put("page", page); + } } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java b/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java index 1efe56f..52c0c74 100644 --- a/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java +++ b/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java @@ -1,6 +1,7 @@ package com.gaotao.modules.wms.service; import com.gaotao.common.utils.PageUtils; +import com.gaotao.modules.inventoryStock.entity.InventoryStockOutData; import com.gaotao.modules.wms.data.InboundQcResultData; import com.gaotao.modules.wms.data.PoOrderRollNoOutData; import org.springframework.web.bind.annotation.RequestBody; @@ -39,4 +40,6 @@ public interface WmsPrintService { void deletePoPartLabelData( List inList); List getPoPartLabelData( List inList); + + PageUtils getKuCunLabelData(InventoryStockOutData inData); } \ No newline at end of file diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml index 6f296f6..ae75b49 100644 --- a/src/main/resources/mapper/wms/WmsPrintMapper.xml +++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml @@ -20,6 +20,12 @@ and A.order_no like '%'+ #{query.orderNo,jdbcType=CHAR} +'%' + + and b.part_no like '%'+ #{query.partNo,jdbcType=CHAR} +'%' + + + and b.part_desc like '%'+ #{query.partDesc,jdbcType=CHAR} +'%' + and b.inspector_date > #{query.startDate}