diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsController.java new file mode 100644 index 000000000..7a05efa2b --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsController.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.WmsFpStorageNews; +import com.op.wms.service.IWmsFpStorageNewsService; +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-08-31 + */ +@RestController +@RequestMapping("/major") +public class WmsFpStorageNewsController extends BaseController { + @Autowired + private IWmsFpStorageNewsService wmsFpStorageNewsService; + + /** + * 查询成品库存主表列表 + */ + @RequiresPermissions("wms:major:list") + @GetMapping("/list") + public TableDataInfo list(WmsFpStorageNews wmsFpStorageNews) { + startPage(); + List list = wmsFpStorageNewsService.selectWmsFpStorageNewsList(wmsFpStorageNews); + return getDataTable(list); + } + + /** + * 导出成品库存主表列表 + */ + @RequiresPermissions("wms:major:export") + @Log(title = "成品库存主表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsFpStorageNews wmsFpStorageNews) { + List list = wmsFpStorageNewsService.selectWmsFpStorageNewsList(wmsFpStorageNews); + ExcelUtil util = new ExcelUtil(WmsFpStorageNews.class); + util.exportExcel(response, list, "成品库存主表数据"); + } + + /** + * 获取成品库存主表详细信息 + */ + @RequiresPermissions("wms:major:query") + @GetMapping(value = "/{storageId}") + public AjaxResult getInfo(@PathVariable("storageId") String storageId) { + return success(wmsFpStorageNewsService.selectWmsFpStorageNewsByStorageId(storageId)); + } + + /** + * 新增成品库存主表 + */ + @RequiresPermissions("wms:major:add") + @Log(title = "成品库存主表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmsFpStorageNews wmsFpStorageNews) { + return toAjax(wmsFpStorageNewsService.insertWmsFpStorageNews(wmsFpStorageNews)); + } + + /** + * 修改成品库存主表 + */ + @RequiresPermissions("wms:major:edit") + @Log(title = "成品库存主表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsFpStorageNews wmsFpStorageNews) { + return toAjax(wmsFpStorageNewsService.updateWmsFpStorageNews(wmsFpStorageNews)); + } + + /** + * 删除成品库存主表 + */ + @RequiresPermissions("wms:major:remove") + @Log(title = "成品库存主表", businessType = BusinessType.DELETE) + @DeleteMapping("/{storageIds}") + public AjaxResult remove(@PathVariable String[] storageIds) { + return toAjax(wmsFpStorageNewsService.deleteWmsFpStorageNewsByStorageIds(storageIds)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java new file mode 100644 index 000000000..5c1968057 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.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.WmsFpStorageNewsSn; +import com.op.wms.service.IWmsFpStorageNewsSnService; +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-04 + */ +@RestController +@RequestMapping("/detailed") +public class WmsFpStorageNewsSnController extends BaseController { + @Autowired + private IWmsFpStorageNewsSnService wmsFpStorageNewsSnService; + + /** + * 查询成品库存明细列表 + */ + @RequiresPermissions("wms:detailed:list") + @GetMapping("/list") + public TableDataInfo list(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + startPage(); + List list = wmsFpStorageNewsSnService.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + return getDataTable(list); + } + + /** + * 导出成品库存明细列表 + */ + @RequiresPermissions("wms:detailed:export") + @Log(title = "成品库存明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsFpStorageNewsSn wmsFpStorageNewsSn) { + List list = wmsFpStorageNewsSnService.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + ExcelUtil util = new ExcelUtil(WmsFpStorageNewsSn.class); + util.exportExcel(response, list, "成品库存明细数据"); + } + + /** + * 获取成品库存明细详细信息 + */ + @RequiresPermissions("wms:detailed:query") + @GetMapping(value = "/{storageId}") + public AjaxResult getInfo(@PathVariable("storageId") String storageId) { + return success(wmsFpStorageNewsSnService.selectWmsFpStorageNewsSnByStorageId(storageId)); + } + + /** + * 新增成品库存明细 + */ + @RequiresPermissions("wms:detailed:add") + @Log(title = "成品库存明细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return toAjax(wmsFpStorageNewsSnService.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn)); + } + + /** + * 修改成品库存明细 + */ + @RequiresPermissions("wms:detailed:edit") + @Log(title = "成品库存明细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return toAjax(wmsFpStorageNewsSnService.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn)); + } + + /** + * 删除成品库存明细 + */ + @RequiresPermissions("wms:detailed:remove") + @Log(title = "成品库存明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{storageIds}") + public AjaxResult remove(@PathVariable String[] storageIds) { + return toAjax(wmsFpStorageNewsSnService.deleteWmsFpStorageNewsSnByStorageIds(storageIds)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java index ee78aa0a4..053daf88f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java @@ -3,14 +3,8 @@ 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 org.springframework.data.redis.core.RedisTemplate; +import org.springframework.web.bind.annotation.*; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; @@ -25,7 +19,7 @@ import com.op.common.core.web.page.TableDataInfo; * 成品生产入库Controller * * @author Open Platform - * @date 2023-08-29 + * @date 2023-08-31 */ @RestController @RequestMapping("/put") @@ -94,4 +88,14 @@ public class WmsProductPutController extends BaseController { public AjaxResult remove(@PathVariable String[] ids) { return toAjax(wmsProductPutService.deleteWmsProductPutByIds(ids)); } + + /** + * 手持接口：根据报工单号查询 + */ + @GetMapping("/s/{workOrder}") + public AjaxResult selectWmsProductPutByWorkOrder(@PathVariable("workOrder") String workOrder){ + return AjaxResult.success(wmsProductPutService.selectWmsProductPutByWorkOrder(workOrder)); + } + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutRecordsController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutRecordsController.java new file mode 100644 index 000000000..6905c6de9 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutRecordsController.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.WmsProductPutRecords; +import com.op.wms.service.IWmsProductPutRecordsService; +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-06 + */ +@RestController +@RequestMapping("/productputrecords") +public class WmsProductPutRecordsController extends BaseController { + @Autowired + private IWmsProductPutRecordsService wmsProductPutRecordsService; + + /** + * 查询成品生产入库记录报列表 + */ + @RequiresPermissions("wms:productputrecords:list") + @GetMapping("/list") + public TableDataInfo list(WmsProductPutRecords wmsProductPutRecords) { + startPage(); + List list = wmsProductPutRecordsService.selectWmsProductPutRecordsList(wmsProductPutRecords); + return getDataTable(list); + } + + /** + * 导出成品生产入库记录报列表 + */ + @RequiresPermissions("wms:productputrecords:export") + @Log(title = "成品生产入库记录报", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsProductPutRecords wmsProductPutRecords) { + List list = wmsProductPutRecordsService.selectWmsProductPutRecordsList(wmsProductPutRecords); + ExcelUtil util = new ExcelUtil(WmsProductPutRecords.class); + util.exportExcel(response, list, "成品生产入库记录报数据"); + } + + /** + * 获取成品生产入库记录报详细信息 + */ + @RequiresPermissions("wms:productputrecords:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(wmsProductPutRecordsService.selectWmsProductPutRecordsById(id)); + } + + /** + * 新增成品生产入库记录报 + */ + @RequiresPermissions("wms:productputrecords:add") + @Log(title = "成品生产入库记录报", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmsProductPutRecords wmsProductPutRecords) { + return toAjax(wmsProductPutRecordsService.insertWmsProductPutRecords(wmsProductPutRecords)); + } + + /** + * 修改成品生产入库记录报 + */ + @RequiresPermissions("wms:productputrecords:edit") + @Log(title = "成品生产入库记录报", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsProductPutRecords wmsProductPutRecords) { + return toAjax(wmsProductPutRecordsService.updateWmsProductPutRecords(wmsProductPutRecords)); + } + + /** + * 删除成品生产入库记录报 + */ + @RequiresPermissions("wms:productputrecords:remove") + @Log(title = "成品生产入库记录报", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(wmsProductPutRecordsService.deleteWmsProductPutRecordsByIds(ids)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayCodeController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayCodeController.java new file mode 100644 index 000000000..489568885 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayCodeController.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.WmsProductPutTrayCode; +import com.op.wms.service.IWmsProductPutTrayCodeService; +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-08-31 + */ +@RestController +@RequestMapping("/code") +public class WmsProductPutTrayCodeController extends BaseController { + @Autowired + private IWmsProductPutTrayCodeService wmsProductPutTrayCodeService; + + /** + * 查询托盘关联箱码列表 + */ + @RequiresPermissions("wms:code:list") + @GetMapping("/list") + public TableDataInfo list(WmsProductPutTrayCode wmsProductPutTrayCode) { + startPage(); + List list = wmsProductPutTrayCodeService.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); + return getDataTable(list); + } + + /** + * 导出托盘关联箱码列表 + */ + @RequiresPermissions("wms:code:export") + @Log(title = "托盘关联箱码", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsProductPutTrayCode wmsProductPutTrayCode) { + List list = wmsProductPutTrayCodeService.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); + ExcelUtil util = new ExcelUtil(WmsProductPutTrayCode.class); + util.exportExcel(response, list, "托盘关联箱码数据"); + } + + /** + * 获取托盘关联箱码详细信息 + */ + @RequiresPermissions("wms:code:query") + @GetMapping(value = "/{storageId}") + public AjaxResult getInfo(@PathVariable("storageId") String storageId) { + return success(wmsProductPutTrayCodeService.selectWmsProductPutTrayCodeByStorageId(storageId)); + } + + /** + * 新增托盘关联箱码 + */ + @RequiresPermissions("wms:code:add") + @Log(title = "托盘关联箱码", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { + return toAjax(wmsProductPutTrayCodeService.insertWmsProductPutTrayCode(wmsProductPutTrayCode)); + } + + /** + * 修改托盘关联箱码 + */ + @RequiresPermissions("wms:code:edit") + @Log(title = "托盘关联箱码", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { + return toAjax(wmsProductPutTrayCodeService.updateWmsProductPutTrayCode(wmsProductPutTrayCode)); + } + + /** + * 删除托盘关联箱码 + */ + @RequiresPermissions("wms:code:remove") + @Log(title = "托盘关联箱码", businessType = BusinessType.DELETE) + @DeleteMapping("/{storageIds}") + public AjaxResult remove(@PathVariable String[] storageIds) { + return toAjax(wmsProductPutTrayCodeService.deleteWmsProductPutTrayCodeByStorageIds(storageIds)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayController.java new file mode 100644 index 000000000..8bf2871c4 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayController.java @@ -0,0 +1,114 @@ +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.WmsProductPutTray; +import com.op.wms.service.IWmsProductPutTrayService; +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-08-31 + */ +@RestController +@RequestMapping("/tray") +public class WmsProductPutTrayController extends BaseController { + @Autowired + private IWmsProductPutTrayService wmsProductPutTrayService; + + /** + * 查询成品生产入库关联托盘列表 + */ + @RequiresPermissions("wms:tray:list") + @GetMapping("/list") + public TableDataInfo list(WmsProductPutTray wmsProductPutTray) { + startPage(); + List list = wmsProductPutTrayService.selectWmsProductPutTrayList(wmsProductPutTray); + return getDataTable(list); + } + + /** + * 导出成品生产入库关联托盘列表 + */ + @RequiresPermissions("wms:tray:export") + @Log(title = "成品生产入库关联托盘", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsProductPutTray wmsProductPutTray) { + List list = wmsProductPutTrayService.selectWmsProductPutTrayList(wmsProductPutTray); + ExcelUtil util = new ExcelUtil(WmsProductPutTray.class); + util.exportExcel(response, list, "成品生产入库关联托盘数据"); + } + + /** + * 获取成品生产入库关联托盘详细信息 + */ + @RequiresPermissions("wms:tray:query") + @GetMapping(value = "/{storageId}") + public AjaxResult getInfo(@PathVariable("storageId") String storageId) { + return success(wmsProductPutTrayService.selectWmsProductPutTrayByStorageId(storageId)); + } + + /** + * 新增成品生产入库关联托盘 + * 输入托盘号，点确认接口 + */ + @RequiresPermissions("wms:tray:add") + @Log(title = "成品生产入库关联托盘", businessType = BusinessType.INSERT) + @PostMapping("/insertTary") + public AjaxResult add(@RequestBody WmsProductPutTray wmsProductPutTray) { + return toAjax(wmsProductPutTrayService.insertWmsProductPutTray(wmsProductPutTray)); + } + + /** + * 修改成品生产入库关联托盘 + */ + @RequiresPermissions("wms:tray:edit") + @Log(title = "成品生产入库关联托盘", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsProductPutTray wmsProductPutTray) { + return toAjax(wmsProductPutTrayService.updateWmsProductPutTray(wmsProductPutTray)); + } + + /** + * 删除成品生产入库关联托盘 + */ + @RequiresPermissions("wms:tray:remove") + @Log(title = "成品生产入库关联托盘", businessType = BusinessType.DELETE) + @DeleteMapping("/{storageIds}") + public AjaxResult remove(@PathVariable String[] storageIds) { + return toAjax(wmsProductPutTrayService.deleteWmsProductPutTrayByStorageIds(storageIds)); + } + + + /** + * 根据托盘号删除 + */ + @DeleteMapping("/deleteTray/{sn}/{workOrder}") + public AjaxResult deleteWmsProductPutTraysBySn(@PathVariable("sn") String sn,@PathVariable("workOrder") String workOrder){ + return toAjax(wmsProductPutTrayService.deleteWmsProductPutTrayBySn(sn,workOrder)); + } + /** + * 手持入库确认 + */ + @PostMapping("/handPut") + public AjaxResult insertWmsProductPutTrays(@RequestBody List wmsProductPutTrays){ + return toAjax(wmsProductPutTrayService.insertWmsProductPutTrays(wmsProductPutTrays)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNews.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNews.java new file mode 100644 index 000000000..1ea62c303 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNews.java @@ -0,0 +1,416 @@ +package com.op.wms.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 成品库存主表对象 wms_fp_storage_news + * + * @author Open Platform + * @date 2023-08-31 + */ +public class WmsFpStorageNews extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 唯一序列 */ + @Excel(name = "唯一序列") + private String storageId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String whCode; + + /** 区域编号 */ + @Excel(name = "区域编号") + private String regionCode; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String waCode; + + /** 库存类型：CP－成品 */ + @Excel(name = "库存类型：CP－成品") + private String storageType; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String wlCode; + + /** 产品编码 */ + @Excel(name = "产品编码") + private String productCode; + + /** 产品名称 */ + @Excel(name = "产品名称") + private String productName; + + /** 总数量 */ + @Excel(name = "总数量") + private BigDecimal amount; + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + /** 冻结数量（预留） */ + @Excel(name = "冻结数量", readConverterExp = "预=留") + private BigDecimal storageAmount; + + /** 占用数量 */ + @Excel(name = "占用数量") + private BigDecimal occupyAmount; + + /** LPN（预留） */ + @Excel(name = "LPN", readConverterExp = "预=留") + private String lpn; + + /** 入库批次号（预留） */ + @Excel(name = "入库批次号", readConverterExp = "预=留") + private String productBatch; + + /** 入库时间（预留） */ + @Excel(name = "入库时间", readConverterExp = "预=留") + private Date receiveDate; + + /** 生产时间（预留） */ + @Excel(name = "生产时间", readConverterExp = "预=留") + private Date productDate; + + /** 单位 */ + @Excel(name = "单位") + private String userDefined1; + + /** SAP库位 */ + @Excel(name = "SAP库位") + private String userDefined2; + + /** 备用3 */ + @Excel(name = "备用3") + private String userDefined3; + + /** 备用4 */ + @Excel(name = "备用4") + private String userDefined4; + + /** 备用5 */ + @Excel(name = "备用5") + private String userDefined5; + + /** 备用6 */ + @Excel(name = "备用6") + private String userDefined6; + + /** 备用7 */ + @Excel(name = "备用7") + private String userDefined7; + + /** 备用8 */ + @Excel(name = "备用8") + private String userDefined8; + + /** 备用9 */ + @Excel(name = "备用9") + private String userDefined9; + + /** 备用10 */ + @Excel(name = "备用10") + private String userDefined10; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtCreate; + + /** 最后更新人 */ + @Excel(name = "最后更新人") + private String lastModifiedBy; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtModified; + + /** 有效标记 */ + @Excel(name = "有效标记") + private String activeFlag; + + /** 工厂号 */ + @Excel(name = "工厂号") + private String factoryCode; + + /** SAP工厂号 */ + @Excel(name = "SAP工厂号") + private String sapFactoryCode; + + /** 库位名称 */ + @Excel(name = "库位名称") + private String wlName; + + public void setStorageId(String storageId) { + this.storageId = storageId; + } + + public String getStorageId() { + return storageId; + } + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getRegionCode() { + return regionCode; + } + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + public void setStorageType(String storageType) { + this.storageType = storageType; + } + + public String getStorageType() { + return storageType; + } + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductCode() { + return productCode; + } + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductName() { + return productName; + } + + public void setStorageAmount(BigDecimal storageAmount) { + this.storageAmount = storageAmount; + } + + public BigDecimal getStorageAmount() { + return storageAmount; + } + public void setOccupyAmount(BigDecimal occupyAmount) { + this.occupyAmount = occupyAmount; + } + + public BigDecimal getOccupyAmount() { + return occupyAmount; + } + public void setLpn(String lpn) { + this.lpn = lpn; + } + + public String getLpn() { + return lpn; + } + public void setProductBatch(String productBatch) { + this.productBatch = productBatch; + } + + public String getProductBatch() { + return productBatch; + } + public void setReceiveDate(Date receiveDate) { + this.receiveDate = receiveDate; + } + + public Date getReceiveDate() { + return receiveDate; + } + public void setProductDate(Date productDate) { + this.productDate = productDate; + } + + public Date getProductDate() { + return productDate; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + public void setUserDefined6(String userDefined6) { + this.userDefined6 = userDefined6; + } + + public String getUserDefined6() { + return userDefined6; + } + public void setUserDefined7(String userDefined7) { + this.userDefined7 = userDefined7; + } + + public String getUserDefined7() { + return userDefined7; + } + public void setUserDefined8(String userDefined8) { + this.userDefined8 = userDefined8; + } + + public String getUserDefined8() { + return userDefined8; + } + public void setUserDefined9(String userDefined9) { + this.userDefined9 = userDefined9; + } + + public String getUserDefined9() { + return userDefined9; + } + public void setUserDefined10(String userDefined10) { + this.userDefined10 = userDefined10; + } + + public String getUserDefined10() { + return userDefined10; + } + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public Date getGmtCreate() { + return gmtCreate; + } + public void setLastModifiedBy(String lastModifiedBy) { + this.lastModifiedBy = lastModifiedBy; + } + + public String getLastModifiedBy() { + return lastModifiedBy; + } + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + public Date getGmtModified() { + return gmtModified; + } + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setSapFactoryCode(String sapFactoryCode) { + this.sapFactoryCode = sapFactoryCode; + } + + public String getSapFactoryCode() { + return sapFactoryCode; + } + public void setWlName(String wlName) { + this.wlName = wlName; + } + + public String getWlName() { + return wlName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("storageId", getStorageId()) + .append("whCode", getWhCode()) + .append("regionCode", getRegionCode()) + .append("waCode", getWaCode()) + .append("storageType", getStorageType()) + .append("wlCode", getWlCode()) + .append("productCode", getProductCode()) + .append("productName", getProductName()) + .append("amount", getAmount()) + .append("storageAmount", getStorageAmount()) + .append("occupyAmount", getOccupyAmount()) + .append("lpn", getLpn()) + .append("productBatch", getProductBatch()) + .append("receiveDate", getReceiveDate()) + .append("productDate", getProductDate()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .append("userDefined6", getUserDefined6()) + .append("userDefined7", getUserDefined7()) + .append("userDefined8", getUserDefined8()) + .append("userDefined9", getUserDefined9()) + .append("userDefined10", getUserDefined10()) + .append("createBy", getCreateBy()) + .append("gmtCreate", getGmtCreate()) + .append("lastModifiedBy", getLastModifiedBy()) + .append("gmtModified", getGmtModified()) + .append("activeFlag", getActiveFlag()) + .append("factoryCode", getFactoryCode()) + .append("sapFactoryCode", getSapFactoryCode()) + .append("wlName", getWlName()) + .toString(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java new file mode 100644 index 000000000..dc189c18d --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java @@ -0,0 +1,340 @@ +package com.op.wms.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +/** + * 成品库存明细对象 wms_fp_storage_news_sn + * + * @author Open Platform + * @date 2023-09-04 + */ +public class WmsFpStorageNewsSn extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 唯一序列号 */ + private String storageId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String whCode; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String waCode; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String wlCode; + + /** 入库单号 */ + @Excel(name = "入库单号") + private String orderNo; + + /** 产品名称 */ + @Excel(name = "产品名称") + private String productName; + + /** 产品编码 */ + @Excel(name = "产品编码") + private String productCode; + + /** 托盘号 */ + @Excel(name = "托盘号") + private String sn; + + /** 条码 */ + @Excel(name = "条码") + private String barCode; + + /** 数量 */ + @Excel(name = "数量") + private BigDecimal amount; + + /** 备用1 */ + @Excel(name = "备用1") + private String userDefined1; + + /** 备用2 */ + @Excel(name = "备用2") + private String userDefined2; + + /** 备用3 */ + @Excel(name = "备用3") + private String userDefined3; + + /** 备用4 */ + @Excel(name = "备用4") + private String userDefined4; + + /** 备用5 */ + @Excel(name = "备用5") + private String userDefined5; + + /** 备用6 */ + @Excel(name = "备用6") + private String userDefined6; + + /** 备用7 */ + @Excel(name = "备用7") + private String userDefined7; + + /** 备用8 */ + @Excel(name = "备用8") + private String userDefined8; + + /** 备用9 */ + @Excel(name = "备用9") + private String userDefined9; + + /** 备用10 */ + @Excel(name = "备用10") + private String userDefined10; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtCreate; + + /** 最后更新人 */ + @Excel(name = "最后更新人") + private String lastModifiedBy; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtModified; + + /** 有效标记 */ + @Excel(name = "有效标记") + private String activeFlag; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** sap工厂编码 */ + @Excel(name = "sap工厂编码") + private String sapFactoryCode; + + public void setStorageId(String storageId) { + this.storageId = storageId; + } + + public String getStorageId() { + return storageId; + } + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductName() { + return productName; + } + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductCode() { + return productCode; + } + public void setSn(String sn) { + this.sn = sn; + } + + public String getSn() { + return sn; + } + public void setBarCode(String barCode) { + this.barCode = barCode; + } + + public String getBarCode() { + return barCode; + } + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getAmount() { + return amount; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + public void setUserDefined6(String userDefined6) { + this.userDefined6 = userDefined6; + } + + public String getUserDefined6() { + return userDefined6; + } + public void setUserDefined7(String userDefined7) { + this.userDefined7 = userDefined7; + } + + public String getUserDefined7() { + return userDefined7; + } + public void setUserDefined8(String userDefined8) { + this.userDefined8 = userDefined8; + } + + public String getUserDefined8() { + return userDefined8; + } + public void setUserDefined9(String userDefined9) { + this.userDefined9 = userDefined9; + } + + public String getUserDefined9() { + return userDefined9; + } + public void setUserDefined10(String userDefined10) { + this.userDefined10 = userDefined10; + } + + public String getUserDefined10() { + return userDefined10; + } + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public Date getGmtCreate() { + return gmtCreate; + } + public void setLastModifiedBy(String lastModifiedBy) { + this.lastModifiedBy = lastModifiedBy; + } + + public String getLastModifiedBy() { + return lastModifiedBy; + } + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + public Date getGmtModified() { + return gmtModified; + } + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setSapFactoryCode(String sapFactoryCode) { + this.sapFactoryCode = sapFactoryCode; + } + + public String getSapFactoryCode() { + return sapFactoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("storageId", getStorageId()) + .append("whCode", getWhCode()) + .append("waCode", getWaCode()) + .append("wlCode", getWlCode()) + .append("orderNo", getOrderNo()) + .append("productName", getProductName()) + .append("productCode", getProductCode()) + .append("sn", getSn()) + .append("barCode", getBarCode()) + .append("amount", getAmount()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .append("userDefined6", getUserDefined6()) + .append("userDefined7", getUserDefined7()) + .append("userDefined8", getUserDefined8()) + .append("userDefined9", getUserDefined9()) + .append("userDefined10", getUserDefined10()) + .append("createBy", getCreateBy()) + .append("gmtCreate", getGmtCreate()) + .append("lastModifiedBy", getLastModifiedBy()) + .append("gmtModified", getGmtModified()) + .append("activeFlag", getActiveFlag()) + .append("factoryCode", getFactoryCode()) + .append("sapFactoryCode", getSapFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java index 6d7051cea..3989bc36f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java @@ -11,7 +11,7 @@ import com.op.common.core.web.domain.BaseEntity; * 成品生产入库对象 wms_product_put * * @author Open Platform - * @date 2023-08-29 + * @date 2023-08-31 */ public class WmsProductPut extends BaseEntity { private static final long serialVersionUID = 1L; @@ -19,12 +19,16 @@ public class WmsProductPut extends BaseEntity { /** ID */ private String id; + /** 报工单号 */ + @Excel(name = "报工单号") + private String workOrder; + /** 工厂编码 */ @Excel(name = "工厂编码") private String factoryCode; - /** 退货单号 */ - @Excel(name = "退货单号") + /** 生产工单号 */ + @Excel(name = "生产工单号") private String productOrder; /** 仓库编码 */ @@ -90,7 +94,7 @@ public class WmsProductPut extends BaseEntity { /** 预留字段1 */ @Excel(name = "预留字段1") - private String attr1; + private String batchNumber; /** 预留字段2 */ @Excel(name = "预留字段2") @@ -135,6 +139,13 @@ public class WmsProductPut extends BaseEntity { public String getId() { return id; } + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } + + public String getWorkOrder() { + return workOrder; + } public void setFactoryCode(String factoryCode) { this.factoryCode = factoryCode; } @@ -254,12 +265,12 @@ public class WmsProductPut extends BaseEntity { public Date getPutDate() { return putDate; } - public void setAttr1(String attr1) { - this.attr1 = attr1; + public void setBatchNumber(String batchNumber) { + this.batchNumber = batchNumber; } - public String getAttr1() { - return attr1; + public String getBatchNumber() { + return batchNumber; } public void setAttr2(String attr2) { this.attr2 = attr2; @@ -329,6 +340,7 @@ public class WmsProductPut extends BaseEntity { public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) + .append("workOrder", getWorkOrder()) .append("factoryCode", getFactoryCode()) .append("productOrder", getProductOrder()) .append("whCode", getWhCode()) @@ -346,7 +358,7 @@ public class WmsProductPut extends BaseEntity { .append("sapProof", getSapProof()) .append("sapMessage", getSapMessage()) .append("putDate", getPutDate()) - .append("attr1", getAttr1()) + .append("batchNumber", getBatchNumber()) .append("attr2", getAttr2()) .append("attr3", getAttr3()) .append("attr4", getAttr4()) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutRecords.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutRecords.java new file mode 100644 index 000000000..cc42b77b0 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutRecords.java @@ -0,0 +1,206 @@ + package com.op.wms.domain; + +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; + +/** + * 成品生产入库记录报对象 wms_product_put_records + * + * @author Open Platform + * @date 2023-09-06 + */ +public class WmsProductPutRecords extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** ID */ + private String id; + + /** 报工单号 */ + @Excel(name = "报工单号") + private String workOrder; + + /** 生产工单号 */ + @Excel(name = "生产工单号") + private String productOrder; + + /** 产品名称 */ + @Excel(name = "产品名称") + private String productName; + + /** 产品编码 */ + @Excel(name = "产品编码") + private String productCode; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String whCode; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String waCode; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String wlCode; + + /** 托盘号 */ + @Excel(name = "托盘号") + private String sn; + + /** 箱数 */ + @Excel(name = "箱数") + private String number; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String userDefined1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String userDefined2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String userDefined3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String userDefined4; + + /** 预留字段5 */ + @Excel(name = "预留字段5") + private String userDefined5; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } + + public String getWorkOrder() { + return workOrder; + } + public void setProductOrder(String productOrder) { + this.productOrder = productOrder; + } + + public String getProductOrder() { + return productOrder; + } + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductName() { + return productName; + } + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductCode() { + return productCode; + } + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + public void setSn(String sn) { + this.sn = sn; + } + + public String getSn() { + return sn; + } + public void setNumber(String number) { + this.number = number; + } + + public String getNumber() { + return number; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("workOrder", getWorkOrder()) + .append("productOrder", getProductOrder()) + .append("productName", getProductName()) + .append("productCode", getProductCode()) + .append("whCode", getWhCode()) + .append("waCode", getWaCode()) + .append("wlCode", getWlCode()) + .append("sn", getSn()) + .append("number", getNumber()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTray.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTray.java new file mode 100644 index 000000000..284321feb --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTray.java @@ -0,0 +1,178 @@ +package com.op.wms.domain; + +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; + +/** + * 成品生产入库关联托盘对象 wms_product_put_tray + * + * @author Open Platform + * @date 2023-08-31 + */ +public class WmsProductPutTray extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 唯一序列 */ + private String storageId; + + /** 报工单号 */ + @Excel(name = "报工单号") + private String workOrder; + + /** 生产工单号 */ + @Excel(name = "生产工单号") + private String productOrder; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String whCode; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String waCode; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String wlCode; + + /** 托盘号 */ + @Excel(name = "托盘号") + private String sn; + + /** 箱数 */ + @Excel(name = "箱数") + private String number; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String batchNumber; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String userDefined2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String userDefined3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String userDefined4; + + /** 预留字段5 */ + @Excel(name = "预留字段5") + private String userDefined5; + + public void setStorageId(String storageId) { + this.storageId = storageId; + } + + public String getStorageId() { + return storageId; + } + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } + + public String getWorkOrder() { + return workOrder; + } + public void setProductOrder(String productOrder) { + this.productOrder = productOrder; + } + + public String getProductOrder() { + return productOrder; + } + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + public void setSn(String sn) { + this.sn = sn; + } + + public String getSn() { + return sn; + } + public void setNumber(String number) { + this.number = number; + } + + public String getNumber() { + return number; + } + public void setBatchNumber(String batchNumber) { + this.batchNumber = batchNumber; + } + + public String getBatchNumber() { + return batchNumber; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("storageId", getStorageId()) + .append("workOrder", getWorkOrder()) + .append("productOrder", getProductOrder()) + .append("whCode", getWhCode()) + .append("waCode", getWaCode()) + .append("wlCode", getWlCode()) + .append("sn", getSn()) + .append("number", getNumber()) + .append("batchNumber", getBatchNumber()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .toString(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java new file mode 100644 index 000000000..b575a98db --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java @@ -0,0 +1,143 @@ +package com.op.wms.domain; + +import io.swagger.models.auth.In; +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; + +/** + * 托盘关联箱码对象 wms_product_put_tray_code + * + * @author Open Platform + * @date 2023-08-31 + */ +public class WmsProductPutTrayCode extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 唯一序列 */ + private String storageId; + + /** 托盘号 */ + @Excel(name = "托盘号") + private String sn; + + /** 箱码 */ + @Excel(name = "箱码") + private String barcode; + + /** 数量 */ + @Excel(name = "数量") + private Integer number; + + /** 关联状态 */ + @Excel(name = "关联状态") + private String relatStatus; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String userDefined1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String userDefined2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String userDefined3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String userDefined4; + + /** 预留字段5 */ + @Excel(name = "预留字段5") + private String userDefined5; + + public void setStorageId(String storageId) { + this.storageId = storageId; + } + + public String getStorageId() { + return storageId; + } + public void setSn(String sn) { + this.sn = sn; + } + + public String getSn() { + return sn; + } + public void setBarcode(String barcode) { + this.barcode = barcode; + } + + public String getBarcode() { + return barcode; + } + public void setNumber(Integer number) { + this.number = number; + } + + public Integer getNumber() { + return number; + } + public void setRelatStatus(String relatStatus) { + this.relatStatus = relatStatus; + } + + public String getRelatStatus() { + return relatStatus; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("storageId", getStorageId()) + .append("sn", getSn()) + .append("barcode", getBarcode()) + .append("number", getNumber()) + .append("relatStatus", getRelatStatus()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .toString(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java new file mode 100644 index 000000000..15043fdc1 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java @@ -0,0 +1,75 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.op.wms.domain.WmsFpStorageNews; +import org.apache.ibatis.annotations.Param; + +/** + * 成品库存主表Mapper接口 + * + * @author Open Platform + * @date 2023-08-31 + */ +public interface WmsFpStorageNewsMapper { + /** + * 查询成品库存主表 + * + * @param storageId 成品库存主表主键 + * @return 成品库存主表 + */ + public WmsFpStorageNews selectWmsFpStorageNewsByStorageId(String storageId); + + /** + * 查询成品库存主表列表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 成品库存主表集合 + */ + public List selectWmsFpStorageNewsList(WmsFpStorageNews wmsFpStorageNews); + + /** + * 新增成品库存主表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 结果 + */ + public int insertWmsFpStorageNews(WmsFpStorageNews wmsFpStorageNews); + + /** + * 修改成品库存主表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 结果 + */ + public int updateWmsFpStorageNews(WmsFpStorageNews wmsFpStorageNews); + + /** + * 删除成品库存主表 + * + * @param storageId 成品库存主表主键 + * @return 结果 + */ + public int deleteWmsFpStorageNewsByStorageId(String storageId); + + /** + * 批量删除成品库存主表 + * + * @param storageIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsFpStorageNewsByStorageIds(String[] storageIds); + + /** + * 根据产品编码查询库存主表 + */ + public WmsFpStorageNews selectWmsFpStorageNewsByProductCode(String productCode); + + /** + * 根据产品编码和库位号查询库存主表 + * @param productCode + * @param wlCode + * @return + */ + public WmsFpStorageNews selectWmsFpStorageNewsByProductCodeAndWlCode(@Param("productCode") String productCode, @Param("wlCode") String wlCode); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java new file mode 100644 index 000000000..2875c9770 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java @@ -0,0 +1,69 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.op.wms.domain.WmsFpStorageNewsSn; +import org.apache.ibatis.annotations.Param; + +/** + * 成品库存明细Mapper接口 + * + * @author Open Platform + * @date 2023-09-04 + */ +public interface WmsFpStorageNewsSnMapper { + /** + * 查询成品库存明细 + * + * @param storageId 成品库存明细主键 + * @return 成品库存明细 + */ + public WmsFpStorageNewsSn selectWmsFpStorageNewsSnByStorageId(String storageId); + + /** + * 查询成品库存明细列表 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 成品库存明细集合 + */ + public List selectWmsFpStorageNewsSnList(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + /** + * 新增成品库存明细 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 结果 + */ + public int insertWmsFpStorageNewsSn(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + /** + * 修改成品库存明细 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 结果 + */ + public int updateWmsFpStorageNewsSn(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + /** + * 删除成品库存明细 + * + * @param storageId 成品库存明细主键 + * @return 结果 + */ + public int deleteWmsFpStorageNewsSnByStorageId(String storageId); + + /** + * 批量删除成品库存明细 + * + * @param storageIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsFpStorageNewsSnByStorageIds(String[] storageIds); + + /** + * 根据库位，托盘号和产品编码查询库存主表 + * @param sn + * @return + */ + public WmsFpStorageNewsSn selectWmsFpStorageNewsSnBySnAndProductCodeAndWlCode(@Param("productCode") String productCode, @Param("sn") String sn,@Param("wlCode") String wlCode); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 808d193cf..1ec730734 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -8,7 +8,7 @@ import com.op.wms.domain.WmsProductPut; * 成品生产入库Mapper接口 * * @author Open Platform - * @date 2023-08-29 + * @date 2023-08-31 */ public interface WmsProductPutMapper { /** @@ -58,4 +58,9 @@ public interface WmsProductPutMapper { * @return 结果 */ public int deleteWmsProductPutByIds(String[] ids); + + /** + * 手持接口：根据报工单号查询 + */ + public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java new file mode 100644 index 000000000..c40956903 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java @@ -0,0 +1,61 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.op.wms.domain.WmsProductPutRecords; + +/** + * 成品生产入库记录报Mapper接口 + * + * @author Open Platform + * @date 2023-09-06 + */ +public interface WmsProductPutRecordsMapper { + /** + * 查询成品生产入库记录报 + * + * @param id 成品生产入库记录报主键 + * @return 成品生产入库记录报 + */ + public WmsProductPutRecords selectWmsProductPutRecordsById(String id); + + /** + * 查询成品生产入库记录报列表 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 成品生产入库记录报集合 + */ + public List selectWmsProductPutRecordsList(WmsProductPutRecords wmsProductPutRecords); + + /** + * 新增成品生产入库记录报 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 结果 + */ + public int insertWmsProductPutRecords(WmsProductPutRecords wmsProductPutRecords); + + /** + * 修改成品生产入库记录报 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 结果 + */ + public int updateWmsProductPutRecords(WmsProductPutRecords wmsProductPutRecords); + + /** + * 删除成品生产入库记录报 + * + * @param id 成品生产入库记录报主键 + * @return 结果 + */ + public int deleteWmsProductPutRecordsById(String id); + + /** + * 批量删除成品生产入库记录报 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsProductPutRecordsByIds(String[] ids); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayCodeMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayCodeMapper.java new file mode 100644 index 000000000..cd0c92b42 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayCodeMapper.java @@ -0,0 +1,75 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.op.wms.domain.WmsProductPutTrayCode; + +/** + * 托盘关联箱码Mapper接口 + * + * @author Open Platform + * @date 2023-08-31 + */ +public interface WmsProductPutTrayCodeMapper { + /** + * 查询托盘关联箱码 + * + * @param storageId 托盘关联箱码主键 + * @return 托盘关联箱码 + */ + public WmsProductPutTrayCode selectWmsProductPutTrayCodeByStorageId(String storageId); + + /** + * 查询托盘关联箱码列表 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 托盘关联箱码集合 + */ + public List selectWmsProductPutTrayCodeList(WmsProductPutTrayCode wmsProductPutTrayCode); + + /** + * 新增托盘关联箱码 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 结果 + */ + public int insertWmsProductPutTrayCode(WmsProductPutTrayCode wmsProductPutTrayCode); + + /** + * 修改托盘关联箱码 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 结果 + */ + public int updateWmsProductPutTrayCode(WmsProductPutTrayCode wmsProductPutTrayCode); + + /** + * 删除托盘关联箱码 + * + * @param storageId 托盘关联箱码主键 + * @return 结果 + */ + public int deleteWmsProductPutTrayCodeByStorageId(String storageId); + + /** + * 批量删除托盘关联箱码 + * + * @param storageIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsProductPutTrayCodeByStorageIds(String[] storageIds); + + /** + * 根据托盘号查询关联状态 + * @param sn + * @return + */ + public WmsProductPutTrayCode selectWmsProductPutTrayCodeBySn(String sn); + + /** + * 根据箱码查询托盘号 + * @param barcode + * @return + */ + public WmsProductPutTrayCode selectWmsProductPutTrayCodeByBarcode(String barcode); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayMapper.java new file mode 100644 index 000000000..5f18f91bb --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayMapper.java @@ -0,0 +1,72 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.op.wms.domain.WmsProductPutTray; +import org.apache.ibatis.annotations.Param; + +/** + * 成品生产入库关联托盘Mapper接口 + * + * @author Open Platform + * @date 2023-08-31 + */ +public interface WmsProductPutTrayMapper { + /** + * 查询成品生产入库关联托盘 + * + * @param storageId 成品生产入库关联托盘主键 + * @return 成品生产入库关联托盘 + */ + public WmsProductPutTray selectWmsProductPutTrayByStorageId(String storageId); + + /** + * 查询成品生产入库关联托盘列表 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 成品生产入库关联托盘集合 + */ + public List selectWmsProductPutTrayList(WmsProductPutTray wmsProductPutTray); + + /** + * 新增成品生产入库关联托盘 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 结果 + */ + public int insertWmsProductPutTray(WmsProductPutTray wmsProductPutTray); + + /** + * 修改成品生产入库关联托盘 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 结果 + */ + public int updateWmsProductPutTray(WmsProductPutTray wmsProductPutTray); + + /** + * 删除成品生产入库关联托盘 + * + * @param storageId 成品生产入库关联托盘主键 + * @return 结果 + */ + public int deleteWmsProductPutTrayByStorageId(String storageId); + + /** + * 批量删除成品生产入库关联托盘 + * + * @param storageIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsProductPutTrayByStorageIds(String[] storageIds); + + /** + * 根据托盘号和报工单号删除接口 + */ + public int deleteWmsProductPutTrayBySn(@Param("sn") String sn , @Param("workOrder") String workOrder); + + /** + * 根据工单号查询托盘 + */ + public List selectWmsProductPutTrayByWorkOrder(String workOrder); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsService.java new file mode 100644 index 000000000..dcaaf8917 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsService.java @@ -0,0 +1,60 @@ +package com.op.wms.service; + +import java.util.List; +import com.op.wms.domain.WmsFpStorageNews; + +/** + * 成品库存主表Service接口 + * + * @author Open Platform + * @date 2023-08-31 + */ +public interface IWmsFpStorageNewsService { + /** + * 查询成品库存主表 + * + * @param storageId 成品库存主表主键 + * @return 成品库存主表 + */ + public WmsFpStorageNews selectWmsFpStorageNewsByStorageId(String storageId); + + /** + * 查询成品库存主表列表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 成品库存主表集合 + */ + public List selectWmsFpStorageNewsList(WmsFpStorageNews wmsFpStorageNews); + + /** + * 新增成品库存主表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 结果 + */ + public int insertWmsFpStorageNews(WmsFpStorageNews wmsFpStorageNews); + + /** + * 修改成品库存主表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 结果 + */ + public int updateWmsFpStorageNews(WmsFpStorageNews wmsFpStorageNews); + + /** + * 批量删除成品库存主表 + * + * @param storageIds 需要删除的成品库存主表主键集合 + * @return 结果 + */ + public int deleteWmsFpStorageNewsByStorageIds(String[] storageIds); + + /** + * 删除成品库存主表信息 + * + * @param storageId 成品库存主表主键 + * @return 结果 + */ + public int deleteWmsFpStorageNewsByStorageId(String storageId); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java new file mode 100644 index 000000000..2991ff556 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java @@ -0,0 +1,62 @@ +package com.op.wms.service; + +import java.util.List; +import com.op.wms.domain.WmsFpStorageNewsSn; + +/** + * 成品库存明细Service接口 + * + * @author Open Platform + * @date 2023-09-04 + */ +public interface IWmsFpStorageNewsSnService { + /** + * 查询成品库存明细 + * + * @param storageId 成品库存明细主键 + * @return 成品库存明细 + */ + public WmsFpStorageNewsSn selectWmsFpStorageNewsSnByStorageId(String storageId); + + /** + * 查询成品库存明细列表 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 成品库存明细集合 + */ + public List selectWmsFpStorageNewsSnList(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + /** + * 新增成品库存明细 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 结果 + */ + public int insertWmsFpStorageNewsSn(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + /** + * 修改成品库存明细 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 结果 + */ + public int updateWmsFpStorageNewsSn(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + /** + * 批量删除成品库存明细 + * + * @param storageIds 需要删除的成品库存明细主键集合 + * @return 结果 + */ + public int deleteWmsFpStorageNewsSnByStorageIds(String[] storageIds); + + /** + * 删除成品库存明细信息 + * + * @param storageId 成品库存明细主键 + * @return 结果 + */ + public int deleteWmsFpStorageNewsSnByStorageId(String storageId); + + +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutRecordsService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutRecordsService.java new file mode 100644 index 000000000..c09a15c0c --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutRecordsService.java @@ -0,0 +1,60 @@ +package com.op.wms.service; + +import java.util.List; +import com.op.wms.domain.WmsProductPutRecords; + +/** + * 成品生产入库记录报Service接口 + * + * @author Open Platform + * @date 2023-09-06 + */ +public interface IWmsProductPutRecordsService { + /** + * 查询成品生产入库记录报 + * + * @param id 成品生产入库记录报主键 + * @return 成品生产入库记录报 + */ + public WmsProductPutRecords selectWmsProductPutRecordsById(String id); + + /** + * 查询成品生产入库记录报列表 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 成品生产入库记录报集合 + */ + public List selectWmsProductPutRecordsList(WmsProductPutRecords wmsProductPutRecords); + + /** + * 新增成品生产入库记录报 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 结果 + */ + public int insertWmsProductPutRecords(WmsProductPutRecords wmsProductPutRecords); + + /** + * 修改成品生产入库记录报 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 结果 + */ + public int updateWmsProductPutRecords(WmsProductPutRecords wmsProductPutRecords); + + /** + * 批量删除成品生产入库记录报 + * + * @param ids 需要删除的成品生产入库记录报主键集合 + * @return 结果 + */ + public int deleteWmsProductPutRecordsByIds(String[] ids); + + /** + * 删除成品生产入库记录报信息 + * + * @param id 成品生产入库记录报主键 + * @return 结果 + */ + public int deleteWmsProductPutRecordsById(String id); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index 63be118c1..d7e17ac3a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -7,7 +7,7 @@ import com.op.wms.domain.WmsProductPut; * 成品生产入库Service接口 * * @author Open Platform - * @date 2023-08-29 + * @date 2023-08-31 */ public interface IWmsProductPutService { /** @@ -57,4 +57,9 @@ public interface IWmsProductPutService { * @return 结果 */ public int deleteWmsProductPutById(String id); + + /** + * 手持接口：根据报工单号查询 + */ + public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayCodeService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayCodeService.java new file mode 100644 index 000000000..e66b33916 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayCodeService.java @@ -0,0 +1,60 @@ +package com.op.wms.service; + +import java.util.List; +import com.op.wms.domain.WmsProductPutTrayCode; + +/** + * 托盘关联箱码Service接口 + * + * @author Open Platform + * @date 2023-08-31 + */ +public interface IWmsProductPutTrayCodeService { + /** + * 查询托盘关联箱码 + * + * @param storageId 托盘关联箱码主键 + * @return 托盘关联箱码 + */ + public WmsProductPutTrayCode selectWmsProductPutTrayCodeByStorageId(String storageId); + + /** + * 查询托盘关联箱码列表 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 托盘关联箱码集合 + */ + public List selectWmsProductPutTrayCodeList(WmsProductPutTrayCode wmsProductPutTrayCode); + + /** + * 新增托盘关联箱码 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 结果 + */ + public int insertWmsProductPutTrayCode(WmsProductPutTrayCode wmsProductPutTrayCode); + + /** + * 修改托盘关联箱码 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 结果 + */ + public int updateWmsProductPutTrayCode(WmsProductPutTrayCode wmsProductPutTrayCode); + + /** + * 批量删除托盘关联箱码 + * + * @param storageIds 需要删除的托盘关联箱码主键集合 + * @return 结果 + */ + public int deleteWmsProductPutTrayCodeByStorageIds(String[] storageIds); + + /** + * 删除托盘关联箱码信息 + * + * @param storageId 托盘关联箱码主键 + * @return 结果 + */ + public int deleteWmsProductPutTrayCodeByStorageId(String storageId); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayService.java new file mode 100644 index 000000000..e756d4e14 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayService.java @@ -0,0 +1,70 @@ +package com.op.wms.service; + +import java.util.List; +import com.op.wms.domain.WmsProductPutTray; + +/** + * 成品生产入库关联托盘Service接口 + * + * @author Open Platform + * @date 2023-08-31 + */ +public interface IWmsProductPutTrayService { + /** + * 查询成品生产入库关联托盘 + * + * @param storageId 成品生产入库关联托盘主键 + * @return 成品生产入库关联托盘 + */ + public WmsProductPutTray selectWmsProductPutTrayByStorageId(String storageId); + + /** + * 查询成品生产入库关联托盘列表 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 成品生产入库关联托盘集合 + */ + public List selectWmsProductPutTrayList(WmsProductPutTray wmsProductPutTray); + + /** + * 新增成品生产入库关联托盘 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 结果 + */ + public int insertWmsProductPutTray(WmsProductPutTray wmsProductPutTray); + + /** + * 修改成品生产入库关联托盘 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 结果 + */ + public int updateWmsProductPutTray(WmsProductPutTray wmsProductPutTray); + + /** + * 批量删除成品生产入库关联托盘 + * + * @param storageIds 需要删除的成品生产入库关联托盘主键集合 + * @return 结果 + */ + public int deleteWmsProductPutTrayByStorageIds(String[] storageIds); + + /** + * 删除成品生产入库关联托盘信息 + * + * @param storageId 成品生产入库关联托盘主键 + * @return 结果 + */ + public int deleteWmsProductPutTrayByStorageId(String storageId); + + /** + * 根据托盘号和报工单号删除接口 + */ + public int deleteWmsProductPutTrayBySn(String sn,String workOrder); + + /** + * 批量添加托盘信息 + */ + public int insertWmsProductPutTrays(List wmsProductPutTrays); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java new file mode 100644 index 000000000..deb801323 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java @@ -0,0 +1,94 @@ +package com.op.wms.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.wms.mapper.WmsFpStorageNewsMapper; +import com.op.wms.domain.WmsFpStorageNews; +import com.op.wms.service.IWmsFpStorageNewsService; + +/** + * 成品库存主表Service业务层处理 + * + * @author Open Platform + * @date 2023-08-31 + */ +@Service +public class WmsFpStorageNewsServiceImpl implements IWmsFpStorageNewsService { + @Autowired + private WmsFpStorageNewsMapper wmsFpStorageNewsMapper; + + /** + * 查询成品库存主表 + * + * @param storageId 成品库存主表主键 + * @return 成品库存主表 + */ + @Override + @DS("#header.poolName") + public WmsFpStorageNews selectWmsFpStorageNewsByStorageId(String storageId) { + return wmsFpStorageNewsMapper.selectWmsFpStorageNewsByStorageId(storageId); + } + + /** + * 查询成品库存主表列表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 成品库存主表 + */ + @Override + @DS("#header.poolName") + public List selectWmsFpStorageNewsList(WmsFpStorageNews wmsFpStorageNews) { + return wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews); + } + + /** + * 新增成品库存主表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertWmsFpStorageNews(WmsFpStorageNews wmsFpStorageNews) { + return wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews); + } + + /** + * 修改成品库存主表 + * + * @param wmsFpStorageNews 成品库存主表 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateWmsFpStorageNews(WmsFpStorageNews wmsFpStorageNews) { + return wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); + } + + /** + * 批量删除成品库存主表 + * + * @param storageIds 需要删除的成品库存主表主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsFpStorageNewsByStorageIds(String[] storageIds) { + return wmsFpStorageNewsMapper.deleteWmsFpStorageNewsByStorageIds(storageIds); + } + + /** + * 删除成品库存主表信息 + * + * @param storageId 成品库存主表主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsFpStorageNewsByStorageId(String storageId) { + return wmsFpStorageNewsMapper.deleteWmsFpStorageNewsByStorageId(storageId); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java new file mode 100644 index 000000000..854f2931a --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java @@ -0,0 +1,94 @@ +package com.op.wms.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.wms.mapper.WmsFpStorageNewsSnMapper; +import com.op.wms.domain.WmsFpStorageNewsSn; +import com.op.wms.service.IWmsFpStorageNewsSnService; + +/** + * 成品库存明细Service业务层处理 + * + * @author Open Platform + * @date 2023-09-04 + */ +@Service +public class WmsFpStorageNewsSnServiceImpl implements IWmsFpStorageNewsSnService { + @Autowired + private WmsFpStorageNewsSnMapper wmsFpStorageNewsSnMapper; + + /** + * 查询成品库存明细 + * + * @param storageId 成品库存明细主键 + * @return 成品库存明细 + */ + @Override + @DS("#header.poolName") + public WmsFpStorageNewsSn selectWmsFpStorageNewsSnByStorageId(String storageId) { + return wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(storageId); + } + + /** + * 查询成品库存明细列表 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 成品库存明细 + */ + @Override + @DS("#header.poolName") + public List selectWmsFpStorageNewsSnList(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + } + + /** + * 新增成品库存明细 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertWmsFpStorageNewsSn(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn); + } + + /** + * 修改成品库存明细 + * + * @param wmsFpStorageNewsSn 成品库存明细 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateWmsFpStorageNewsSn(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn); + } + + /** + * 批量删除成品库存明细 + * + * @param storageIds 需要删除的成品库存明细主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsFpStorageNewsSnByStorageIds(String[] storageIds) { + return wmsFpStorageNewsSnMapper.deleteWmsFpStorageNewsSnByStorageIds(storageIds); + } + + /** + * 删除成品库存明细信息 + * + * @param storageId 成品库存明细主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsFpStorageNewsSnByStorageId(String storageId) { + return wmsFpStorageNewsSnMapper.deleteWmsFpStorageNewsSnByStorageId(storageId); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutRecordsServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutRecordsServiceImpl.java new file mode 100644 index 000000000..9314d649f --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutRecordsServiceImpl.java @@ -0,0 +1,97 @@ +package com.op.wms.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.wms.mapper.WmsProductPutRecordsMapper; +import com.op.wms.domain.WmsProductPutRecords; +import com.op.wms.service.IWmsProductPutRecordsService; + +/** + * 成品生产入库记录报Service业务层处理 + * + * @author Open Platform + * @date 2023-09-06 + */ +@Service +public class WmsProductPutRecordsServiceImpl implements IWmsProductPutRecordsService { + @Autowired + private WmsProductPutRecordsMapper wmsProductPutRecordsMapper; + + /** + * 查询成品生产入库记录报 + * + * @param id 成品生产入库记录报主键 + * @return 成品生产入库记录报 + */ + @Override + @DS("#header.poolName") + public WmsProductPutRecords selectWmsProductPutRecordsById(String id) { + return wmsProductPutRecordsMapper.selectWmsProductPutRecordsById(id); + } + + /** + * 查询成品生产入库记录报列表 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 成品生产入库记录报 + */ + @Override + @DS("#header.poolName") + public List selectWmsProductPutRecordsList(WmsProductPutRecords wmsProductPutRecords) { + return wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords); + } + + /** + * 新增成品生产入库记录报 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertWmsProductPutRecords(WmsProductPutRecords wmsProductPutRecords) { + wmsProductPutRecords.setCreateTime(DateUtils.getNowDate()); + return wmsProductPutRecordsMapper.insertWmsProductPutRecords(wmsProductPutRecords); + } + + /** + * 修改成品生产入库记录报 + * + * @param wmsProductPutRecords 成品生产入库记录报 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateWmsProductPutRecords(WmsProductPutRecords wmsProductPutRecords) { + wmsProductPutRecords.setUpdateTime(DateUtils.getNowDate()); + return wmsProductPutRecordsMapper.updateWmsProductPutRecords(wmsProductPutRecords); + } + + /** + * 批量删除成品生产入库记录报 + * + * @param ids 需要删除的成品生产入库记录报主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsProductPutRecordsByIds(String[] ids) { + return wmsProductPutRecordsMapper.deleteWmsProductPutRecordsByIds(ids); + } + + /** + * 删除成品生产入库记录报信息 + * + * @param id 成品生产入库记录报主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsProductPutRecordsById(String id) { + return wmsProductPutRecordsMapper.deleteWmsProductPutRecordsById(id); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 95b417af9..f73aa377e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1,11 +1,16 @@ package com.op.wms.service.impl; import java.util.List; +import java.util.concurrent.TimeUnit; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; -import com.op.common.core.utils.uuid.IdUtils; +import com.op.wms.domain.WmsProductPutTray; +import com.op.wms.domain.WmsProductPutTrayCode; +import com.op.wms.mapper.WmsProductPutTrayMapper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; import com.op.wms.mapper.WmsProductPutMapper; import com.op.wms.domain.WmsProductPut; @@ -15,13 +20,14 @@ import com.op.wms.service.IWmsProductPutService; * 成品生产入库Service业务层处理 * * @author Open Platform - * @date 2023-08-29 + * @date 2023-08-31 */ @Service public class WmsProductPutServiceImpl implements IWmsProductPutService { @Autowired - private WmsProductPutMapper wmsProductPutMapper; + @Autowired + private RedisTemplate redisTemplate; /** * 查询成品生产入库 @@ -30,6 +36,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { * @return 成品生产入库 */ @Override + @DS("#header.poolName") public WmsProductPut selectWmsProductPutById(String id) { return wmsProductPutMapper.selectWmsProductPutById(id); } @@ -55,7 +62,6 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override @DS("#header.poolName") public int insertWmsProductPut(WmsProductPut wmsProductPut) { - wmsProductPut.setId(IdUtils.fastSimpleUUID()); wmsProductPut.setCreateTime(DateUtils.getNowDate()); return wmsProductPutMapper.insertWmsProductPut(wmsProductPut); } @@ -96,4 +102,23 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { public int deleteWmsProductPutById(String id) { return wmsProductPutMapper.deleteWmsProductPutById(id); } + + + /** + * 手持接口：根据报工单号查询 + */ + @Override + @DS("#header.poolName") + public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder) { + /** + * 根据报工单号查询所有托盘信息 + */ + ValueOperations valueOperations = redisTemplate.opsForValue(); + valueOperations.set("workOrder",workOrder,60, TimeUnit.MINUTES); +// List wmsProductPutTrays = wmsProductPutTrayMapper.selectWmsProductPutTrayByWorkOrder(workOrder); +// for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { +// wmsProductPutTrayMapper.insertWmsProductPutTray(wmsProductPutTray); +// } + return wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayCodeServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayCodeServiceImpl.java new file mode 100644 index 000000000..435232081 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayCodeServiceImpl.java @@ -0,0 +1,94 @@ +package com.op.wms.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.wms.mapper.WmsProductPutTrayCodeMapper; +import com.op.wms.domain.WmsProductPutTrayCode; +import com.op.wms.service.IWmsProductPutTrayCodeService; + +/** + * 托盘关联箱码Service业务层处理 + * + * @author Open Platform + * @date 2023-08-31 + */ +@Service +public class WmsProductPutTrayCodeServiceImpl implements IWmsProductPutTrayCodeService { + @Autowired + private WmsProductPutTrayCodeMapper wmsProductPutTrayCodeMapper; + + /** + * 查询托盘关联箱码 + * + * @param storageId 托盘关联箱码主键 + * @return 托盘关联箱码 + */ + @Override + @DS("#header.poolName") + public WmsProductPutTrayCode selectWmsProductPutTrayCodeByStorageId(String storageId) { + return wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeByStorageId(storageId); + } + + /** + * 查询托盘关联箱码列表 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 托盘关联箱码 + */ + @Override + @DS("#header.poolName") + public List selectWmsProductPutTrayCodeList(WmsProductPutTrayCode wmsProductPutTrayCode) { + return wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); + } + + /** + * 新增托盘关联箱码 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertWmsProductPutTrayCode(WmsProductPutTrayCode wmsProductPutTrayCode) { + return wmsProductPutTrayCodeMapper.insertWmsProductPutTrayCode(wmsProductPutTrayCode); + } + + /** + * 修改托盘关联箱码 + * + * @param wmsProductPutTrayCode 托盘关联箱码 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateWmsProductPutTrayCode(WmsProductPutTrayCode wmsProductPutTrayCode) { + return wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); + } + + /** + * 批量删除托盘关联箱码 + * + * @param storageIds 需要删除的托盘关联箱码主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsProductPutTrayCodeByStorageIds(String[] storageIds) { + return wmsProductPutTrayCodeMapper.deleteWmsProductPutTrayCodeByStorageIds(storageIds); + } + + /** + * 删除托盘关联箱码信息 + * + * @param storageId 托盘关联箱码主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsProductPutTrayCodeByStorageId(String storageId) { + return wmsProductPutTrayCodeMapper.deleteWmsProductPutTrayCodeByStorageId(storageId); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java new file mode 100644 index 000000000..0f4cfddeb --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java @@ -0,0 +1,262 @@ +package com.op.wms.service.impl; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Random; + +import com.alibaba.nacos.common.utils.UuidUtils; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.exception.ServiceException; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.wms.domain.*; +import com.op.wms.mapper.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Service; +import com.op.wms.service.IWmsProductPutTrayService; +import org.springframework.util.ObjectUtils; + +/** + * 成品生产入库关联托盘Service业务层处理 + * + * @author Open Platform + * @date 2023-08-31 + */ +@Service +public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { + @Autowired + private WmsProductPutTrayMapper wmsProductPutTrayMapper; + @Autowired + private RedisTemplate redisTemplate; + @Autowired + private WmsProductPutMapper wmsProductPutMapper; + + @Autowired + private WmsFpStorageNewsMapper wmsFpStorageNewsMapper; + @Autowired + private WmsFpStorageNewsSnMapper wmsFpStorageNewsSnMapper; + @Autowired + private WmsProductPutTrayCodeMapper wmsProductPutTrayCodeMapper; + @Autowired + private WmsProductPutRecordsMapper wmsProductPutRecordsMapper; + /** + * 查询成品生产入库关联托盘 + * + * @param storageId 成品生产入库关联托盘主键 + * @return 成品生产入库关联托盘 + */ + @Override + @DS("#header.poolName") + public WmsProductPutTray selectWmsProductPutTrayByStorageId(String storageId) { + return wmsProductPutTrayMapper.selectWmsProductPutTrayByStorageId(storageId); + } + + /** + * 查询成品生产入库关联托盘列表 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 成品生产入库关联托盘 + */ + @Override + @DS("#header.poolName") + public List selectWmsProductPutTrayList(WmsProductPutTray wmsProductPutTray) { + return wmsProductPutTrayMapper.selectWmsProductPutTrayList(wmsProductPutTray); + } + + /** + * 新增成品生产入库关联托盘 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertWmsProductPutTray(WmsProductPutTray wmsProductPutTray) { + WmsProductPutTrayCode wmsProductPutTrayCode = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn(wmsProductPutTray.getSn()); + if (wmsProductPutTrayCode.getRelatStatus().equals("0")){ + ValueOperations valueOperations = redisTemplate.opsForValue(); + String workOrder = valueOperations.get("workOrder"); + WmsProductPut wmsProductPut = wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder); + wmsProductPutTray.setStorageId(IdUtils.fastSimpleUUID()); + wmsProductPutTray.setWorkOrder(workOrder); + wmsProductPutTray.setProductOrder(wmsProductPut.getProductOrder()); + wmsProductPutTray.setWhCode(wmsProductPut.getWhCode()); + wmsProductPutTray.setWaCode(wmsProductPut.getWaCode()); + wmsProductPutTray.setBatchNumber(wmsProductPut.getBatchNumber()); + }else { + throw new ServiceException("该托盘已经被占用！"); + } + return wmsProductPutTrayMapper.insertWmsProductPutTray(wmsProductPutTray); + } + + /** + * 修改成品生产入库关联托盘 + * + * @param wmsProductPutTray 成品生产入库关联托盘 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateWmsProductPutTray(WmsProductPutTray wmsProductPutTray) { + return wmsProductPutTrayMapper.updateWmsProductPutTray(wmsProductPutTray); + } + + /** + * 批量删除成品生产入库关联托盘 + * + * @param storageIds 需要删除的成品生产入库关联托盘主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsProductPutTrayByStorageIds(String[] storageIds) { + return wmsProductPutTrayMapper.deleteWmsProductPutTrayByStorageIds(storageIds); + } + + /** + * 删除成品生产入库关联托盘信息 + * + * @param storageId 成品生产入库关联托盘主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsProductPutTrayByStorageId(String storageId) { + return wmsProductPutTrayMapper.deleteWmsProductPutTrayByStorageId(storageId); + } + + + + /** + * 根据托盘号删除接口 + */ + @Override + @DS("#header.poolName") + public int deleteWmsProductPutTrayBySn(String sn, String workOrder) { + return wmsProductPutTrayMapper.deleteWmsProductPutTrayBySn(sn,workOrder); + } + + + /** + * 手持确认入库批量添加 + */ + @Override + @DS("#header.poolName") + public int insertWmsProductPutTrays(List wmsProductPutTrays){ + ValueOperations valueOperations = redisTemplate.opsForValue(); + String workOrder = valueOperations.get("workOrder"); + WmsProductPut wmsProductPut = wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder); + //加库存 + for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { + WmsFpStorageNews wmsFpStorageNews = wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCodeAndWlCode(wmsProductPut.getProductCode(), wmsProductPutTray.getWlCode()); + WmsFpStorageNews wmsFpStorageNews1 = new WmsFpStorageNews(); + if (ObjectUtils.isEmpty(wmsFpStorageNews)){ + // TODO 库存中没有此产品,添加 + wmsFpStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); + wmsFpStorageNews1.setWhCode(wmsProductPut.getWhCode()); + wmsFpStorageNews1.setWaCode(wmsProductPut.getWaCode()); + wmsFpStorageNews1.setStorageType("成品"); + wmsFpStorageNews1.setWlCode(wmsProductPutTray.getWlCode()); + wmsFpStorageNews1.setProductCode(wmsProductPut.getProductCode()); + wmsFpStorageNews1.setProductName(wmsProductPut.getProductName()); + BigDecimal putQuantity = new BigDecimal(wmsProductPutTray.getNumber()); + wmsFpStorageNews1.setAmount(putQuantity); + wmsFpStorageNews1.setCreateBy(SecurityContextHolder.getUserName()); + wmsFpStorageNews1.setCreateTime(new Date()); + wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews1); + }else { + //加库存数量 + BigDecimal putQuantity = new BigDecimal(wmsProductPutTray.getNumber()); + wmsFpStorageNews.setAmount(wmsFpStorageNews.getAmount().add(putQuantity)); + wmsFpStorageNews.setUpdateBy(SecurityContextHolder.getUserName()); + wmsFpStorageNews.setUpdateTime(new Date()); + wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); + } + } +// WmsFpStorageNews wmsFpStorageNews = wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCode(wmsProductPut.getProductCode()); +// WmsFpStorageNews wmsFpStorageNews1 = new WmsFpStorageNews(); +// // TODO 库存中没有此产品,添加 +// if (ObjectUtils.isEmpty(wmsFpStorageNews)){ +// wmsFpStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); +// wmsFpStorageNews1.setWhCode(wmsProductPut.getWhCode()); +// wmsFpStorageNews1.setWaCode(wmsProductPut.getWaCode()); +// wmsFpStorageNews1.setStorageType("成品"); +// wmsFpStorageNews1.setWlCode(wmsProductPut.getWlCode()); +// wmsFpStorageNews1.setProductCode(wmsProductPut.getProductCode()); +// wmsFpStorageNews1.setProductName(wmsProductPut.getProductName()); +// BigDecimal putQuantity = new BigDecimal(wmsProductPut.getPutQuantity()); +// wmsFpStorageNews1.setAmount(putQuantity); +// wmsFpStorageNews1.setCreateBy(SecurityContextHolder.getUserName()); +// wmsFpStorageNews1.setCreateTime(new Date()); +// wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews1); +// }else { +// //加库存数量 +// BigDecimal putQuantity = new BigDecimal(wmsProductPut.getPutQuantity()); +// wmsFpStorageNews.setAmount(wmsFpStorageNews.getAmount().add(putQuantity)); +// wmsFpStorageNews.setUpdateBy(SecurityContextHolder.getUserName()); +// wmsFpStorageNews.setUpdateTime(new Date()); +// wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); +// } + //生成库存明细 + + for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { + WmsFpStorageNewsSn wmsFpStorageNewsSn1 = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnBySnAndProductCodeAndWlCode(wmsProductPut.getProductCode(), wmsProductPutTray.getSn(), wmsProductPutTray.getWlCode()); + WmsFpStorageNewsSn wmsFpStorageNewsSn = new WmsFpStorageNewsSn(); + if (ObjectUtils.isEmpty(wmsFpStorageNewsSn1)){ + wmsFpStorageNewsSn.setStorageId(IdUtils.fastSimpleUUID()); + wmsFpStorageNewsSn.setWhCode(wmsProductPut.getWhCode()); + wmsFpStorageNewsSn.setWaCode(wmsProductPut.getWaCode()); + wmsFpStorageNewsSn.setWlCode(wmsProductPutTray.getWlCode()); + wmsFpStorageNewsSn.setOrderNo(IdUtils.fastSimpleUUID()); + wmsFpStorageNewsSn.setProductName(wmsProductPut.getProductName()); + wmsFpStorageNewsSn.setProductCode(wmsProductPut.getProductCode()); + wmsFpStorageNewsSn.setSn(wmsProductPutTray.getSn()); + BigDecimal number = new BigDecimal(wmsProductPutTray.getNumber()); + wmsFpStorageNewsSn.setAmount(number); + wmsFpStorageNewsSn.setCreateBy(SecurityContextHolder.getUserName()); + wmsFpStorageNewsSn.setCreateTime(new Date()); + wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn); + }else { + //加库存数量 + BigDecimal putQuantity = new BigDecimal(wmsProductPutTray.getNumber()); + wmsFpStorageNewsSn1.setAmount(wmsFpStorageNewsSn1.getAmount().add(putQuantity)); + wmsFpStorageNewsSn1.setUpdateBy(SecurityContextHolder.getUserName()); + wmsFpStorageNewsSn1.setUpdateTime(new Date()); + wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn1); + } + + } + //todo 修改入库状态 + wmsProductPut.setStatus("1"); + wmsProductPutMapper.updateWmsProductPut(wmsProductPut); + //todo 生成成品入库记录报表 + for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { + WmsProductPutRecords wmsProductPutRecords = new WmsProductPutRecords(); + wmsProductPutRecords.setId(IdUtils.fastSimpleUUID()); + wmsProductPutRecords.setWorkOrder(workOrder); + wmsProductPutRecords.setProductCode(wmsProductPut.getProductCode()); + wmsProductPutRecords.setProductName(wmsProductPut.getProductName()); + wmsProductPutRecords.setProductOrder(wmsProductPut.getProductOrder()); + wmsProductPutRecords.setWhCode(wmsProductPut.getWhCode()); + wmsProductPutRecords.setWaCode(wmsProductPut.getWaCode()); + wmsProductPutRecords.setWlCode(wmsProductPutTray.getWlCode()); + wmsProductPutRecords.setSn(wmsProductPutTray.getSn()); + wmsProductPutRecords.setNumber(wmsProductPutTray.getNumber()); + wmsProductPutRecords.setCreateBy(SecurityContextHolder.getUserName()); + wmsProductPutRecords.setCreateTime(new Date()); + wmsProductPutRecordsMapper.insertWmsProductPutRecords(wmsProductPutRecords); + } + //todo 增加托盘上的数量 + for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { + WmsProductPutTrayCode wmsProductPutTrayCode = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn(wmsProductPutTray.getSn()); + wmsProductPutTrayCode.setRelatStatus("1"); + wmsProductPutTrayCode.setNumber(wmsProductPutTrayCode.getNumber()+Integer.parseInt(wmsProductPutTray.getNumber())); + wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); + } + return 1; + } +} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml new file mode 100644 index 000000000..b2c25bdf5 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, product_code, product_name, amount, storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_fp_storage_news + + + + + + + + + + + + + insert into wms_fp_storage_news + + storage_id, + wh_code, + region_code, + wa_code, + storage_type, + wl_code, + product_code, + product_name, + amount, + storage_amount, + occupy_amount, + lpn, + product_batch, + receive_date, + product_date, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + user_defined6, + user_defined7, + user_defined8, + user_defined9, + user_defined10, + create_by, + gmt_create, + last_modified_by, + gmt_modified, + active_flag, + factory_code, + sap_factory_code, + wl_name, + + + #{storageId}, + #{whCode}, + #{regionCode}, + #{waCode}, + #{storageType}, + #{wlCode}, + #{productCode}, + #{productName}, + #{amount}, + #{storageAmount}, + #{occupyAmount}, + #{lpn}, + #{productBatch}, + #{receiveDate}, + #{productDate}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{createBy}, + #{gmtCreate}, + #{lastModifiedBy}, + #{gmtModified}, + #{activeFlag}, + #{factoryCode}, + #{sapFactoryCode}, + #{wlName}, + + + + + update wms_fp_storage_news + + wh_code = #{whCode}, + region_code = #{regionCode}, + wa_code = #{waCode}, + storage_type = #{storageType}, + wl_code = #{wlCode}, + product_code = #{productCode}, + product_name = #{productName}, + amount = #{amount}, + storage_amount = #{storageAmount}, + occupy_amount = #{occupyAmount}, + lpn = #{lpn}, + product_batch = #{productBatch}, + receive_date = #{receiveDate}, + product_date = #{productDate}, + user_defined1 = #{userDefined1}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + user_defined6 = #{userDefined6}, + user_defined7 = #{userDefined7}, + user_defined8 = #{userDefined8}, + user_defined9 = #{userDefined9}, + user_defined10 = #{userDefined10}, + create_by = #{createBy}, + gmt_create = #{gmtCreate}, + last_modified_by = #{lastModifiedBy}, + gmt_modified = #{gmtModified}, + active_flag = #{activeFlag}, + factory_code = #{factoryCode}, + sap_factory_code = #{sapFactoryCode}, + wl_name = #{wlName}, + + where storage_id = #{storageId} + + + + delete from wms_fp_storage_news where storage_id = #{storageId} + + + + delete from wms_fp_storage_news where storage_id in + + #{storageId} + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml new file mode 100644 index 000000000..c209ac2a0 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select storage_id, wh_code, wa_code, wl_code, order_no, product_name, product_code, sn, bar_code, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_fp_storage_news_sn + + + + + + + + + + insert into wms_fp_storage_news_sn + + storage_id, + wh_code, + wa_code, + wl_code, + order_no, + product_name, + product_code, + sn, + bar_code, + amount, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + user_defined6, + user_defined7, + user_defined8, + user_defined9, + user_defined10, + create_by, + gmt_create, + last_modified_by, + gmt_modified, + active_flag, + factory_code, + sap_factory_code, + + + #{storageId}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{orderNo}, + #{productName}, + #{productCode}, + #{sn}, + #{barCode}, + #{amount}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{createBy}, + #{gmtCreate}, + #{lastModifiedBy}, + #{gmtModified}, + #{activeFlag}, + #{factoryCode}, + #{sapFactoryCode}, + + + + + update wms_fp_storage_news_sn + + wh_code = #{whCode}, + wa_code = #{waCode}, + wl_code = #{wlCode}, + order_no = #{orderNo}, + product_name = #{productName}, + product_code = #{productCode}, + sn = #{sn}, + bar_code = #{barCode}, + amount = #{amount}, + user_defined1 = #{userDefined1}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + user_defined6 = #{userDefined6}, + user_defined7 = #{userDefined7}, + user_defined8 = #{userDefined8}, + user_defined9 = #{userDefined9}, + user_defined10 = #{userDefined10}, + create_by = #{createBy}, + gmt_create = #{gmtCreate}, + last_modified_by = #{lastModifiedBy}, + gmt_modified = #{gmtModified}, + active_flag = #{activeFlag}, + factory_code = #{factoryCode}, + sap_factory_code = #{sapFactoryCode}, + + where storage_id = #{storageId} + + + + delete from wms_fp_storage_news_sn where storage_id = #{storageId} + + + + delete from wms_fp_storage_news_sn where storage_id in + + #{storageId} + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 9ed37044c..7be217f43 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -40,12 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put + select id, work_order, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, batch_number, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put - - + + + + insert into wms_product_put id, - factory_code, + work_order, + factory_code, product_order, wh_code, wa_code, @@ -102,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SAP_proof, SAP_message, put_date, - attr1, + batch_number, attr2, attr3, attr4, @@ -119,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id}, - #{factoryCode}, + #{workOrder}, + #{factoryCode}, #{productOrder}, #{whCode}, #{waCode}, @@ -136,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sapProof}, #{sapMessage}, #{putDate}, - #{attr1}, + #{batch_number}, #{attr2}, #{attr3}, #{attr4}, @@ -156,7 +172,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update wms_product_put - factory_code = #{factoryCode}, + work_order = #{workOrder}, + factory_code = #{factoryCode}, product_order = #{productOrder}, wh_code = #{whCode}, wa_code = #{waCode}, @@ -173,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SAP_proof = #{sapProof}, SAP_message = #{sapMessage}, put_date = #{putDate}, - attr1 = #{attr1}, + batch_number = #{batchNumber}, attr2 = #{attr2}, attr3 = #{attr3}, attr4 = #{attr4}, diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml new file mode 100644 index 000000000..ce62f4675 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, work_order, product_order, product_name, product_code, wh_code, wa_code, wl_code, sn, number, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, create_by, create_time, update_by, update_time from wms_product_put_records + + + + + + + + insert into wms_product_put_records + + id, + work_order, + product_order, + product_name, + product_code, + wh_code, + wa_code, + wl_code, + sn, + number, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{workOrder}, + #{productOrder}, + #{productName}, + #{productCode}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{sn}, + #{number}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wms_product_put_records + + work_order = #{workOrder}, + product_order = #{productOrder}, + product_name = #{productName}, + product_code = #{productCode}, + wh_code = #{whCode}, + wa_code = #{waCode}, + wl_code = #{wlCode}, + sn = #{sn}, + number = #{number}, + user_defined1 = #{userDefined1}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from wms_product_put_records where id = #{id} + + + + delete from wms_product_put_records where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayCodeMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayCodeMapper.xml new file mode 100644 index 000000000..ffdcd657f --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayCodeMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + select storage_id, sn, barcode, number, relat_status, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5 from wms_product_put_tray_code + + + + + + + + + + + + + + insert into wms_product_put_tray_code + + storage_id, + sn, + barcode, + number, + relat_status, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + + + #{storageId}, + #{sn}, + #{barcode}, + #{number}, + #{relatStatus}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + + + + + update wms_product_put_tray_code + + sn = #{sn}, + barcode = #{barcode}, + number = #{number}, + relat_status = #{relatStatus}, + user_defined1 = #{userDefined1}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + + where storage_id = #{storageId} + + + + delete from wms_product_put_tray_code where storage_id = #{storageId} + + + + delete from wms_product_put_tray_code where storage_id in + + #{storageId} + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayMapper.xml new file mode 100644 index 000000000..39b39913a --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + select storage_id, work_order, product_order, wh_code, wa_code, wl_code, sn, number, batch_number, user_defined2, user_defined3, user_defined4, user_defined5 from wms_product_put_tray + + + + + + + + + + insert into wms_product_put_tray + + storage_id, + work_order, + product_order, + wh_code, + wa_code, + wl_code, + sn, + number, + batch_number, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + + + #{storageId}, + #{workOrder}, + #{productOrder}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{sn}, + #{number}, + #{batch_number}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + + + + + update wms_product_put_tray + + work_order = #{workOrder}, + product_order = #{productOrder}, + wh_code = #{whCode}, + wa_code = #{waCode}, + wl_code = #{wlCode}, + sn = #{sn}, + number = #{number}, + batch_number = #{batchNumber}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + + where storage_id = #{storageId} + + + + delete from wms_product_put_tray where storage_id = #{storageId} + + + + delete from wms_product_put_tray where storage_id in + + #{storageId} + + + + + delete from wms_product_put_tray where sn = #{sn} and work_order = #{workOrder} + + \ No newline at end of file