成品生产入库修改

highway
chj 2 years ago
parent c1885b1805
commit 0590a13141

@ -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<WmsFpStorageNews> 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<WmsFpStorageNews> list = wmsFpStorageNewsService.selectWmsFpStorageNewsList(wmsFpStorageNews);
ExcelUtil<WmsFpStorageNews> util = new ExcelUtil<WmsFpStorageNews>(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));
}
}

@ -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<WmsFpStorageNewsSn> 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<WmsFpStorageNewsSn> list = wmsFpStorageNewsSnService.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
ExcelUtil<WmsFpStorageNewsSn> util = new ExcelUtil<WmsFpStorageNewsSn>(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));
}
}

@ -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));
}
}

@ -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<WmsProductPutRecords> 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<WmsProductPutRecords> list = wmsProductPutRecordsService.selectWmsProductPutRecordsList(wmsProductPutRecords);
ExcelUtil<WmsProductPutRecords> util = new ExcelUtil<WmsProductPutRecords>(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));
}
}

@ -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<WmsProductPutTrayCode> 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<WmsProductPutTrayCode> list = wmsProductPutTrayCodeService.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);
ExcelUtil<WmsProductPutTrayCode> util = new ExcelUtil<WmsProductPutTrayCode>(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));
}
}

@ -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<WmsProductPutTray> 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<WmsProductPutTray> list = wmsProductPutTrayService.selectWmsProductPutTrayList(wmsProductPutTray);
ExcelUtil<WmsProductPutTray> util = new ExcelUtil<WmsProductPutTray>(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<WmsProductPutTray> wmsProductPutTrays){
return toAjax(wmsProductPutTrayService.insertWmsProductPutTrays(wmsProductPutTrays));
}
}

@ -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();
}
}

@ -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();
}
}

@ -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())

@ -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();
}
}

@ -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();
}
}

@ -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();
}
}

@ -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<WmsFpStorageNews> 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);
}

@ -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<WmsFpStorageNewsSn> 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);
}

@ -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);
}

@ -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<WmsProductPutRecords> 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);
}

@ -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<WmsProductPutTrayCode> 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);
}

@ -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<WmsProductPutTray> 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<WmsProductPutTray> selectWmsProductPutTrayByWorkOrder(String workOrder);
}

@ -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<WmsFpStorageNews> 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);
}

@ -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<WmsFpStorageNewsSn> 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);
}

@ -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<WmsProductPutRecords> 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);
}

@ -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);
}

@ -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<WmsProductPutTrayCode> 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);
}

@ -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<WmsProductPutTray> 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<WmsProductPutTray> wmsProductPutTrays);
}

@ -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<WmsFpStorageNews> 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);
}
}

@ -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<WmsFpStorageNewsSn> 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);
}
}

@ -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<WmsProductPutRecords> 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);
}
}

@ -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<String,String> 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<String, String> valueOperations = redisTemplate.opsForValue();
valueOperations.set("workOrder",workOrder,60, TimeUnit.MINUTES);
// List<WmsProductPutTray> wmsProductPutTrays = wmsProductPutTrayMapper.selectWmsProductPutTrayByWorkOrder(workOrder);
// for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) {
// wmsProductPutTrayMapper.insertWmsProductPutTray(wmsProductPutTray);
// }
return wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder);
}
}

@ -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<WmsProductPutTrayCode> 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);
}
}

@ -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<String,String> 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<WmsProductPutTray> 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<String, String> 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<WmsProductPutTray> wmsProductPutTrays){
ValueOperations<String,String> 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;
}
}

@ -0,0 +1,291 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.WmsFpStorageNewsMapper">
<resultMap type="WmsFpStorageNews" id="WmsFpStorageNewsResult">
<result property="storageId" column="storage_id" />
<result property="whCode" column="wh_code" />
<result property="regionCode" column="region_code" />
<result property="waCode" column="wa_code" />
<result property="storageType" column="storage_type" />
<result property="wlCode" column="wl_code" />
<result property="productCode" column="product_code" />
<result property="productName" column="product_name" />
<result property="amount" column="amount" />
<result property="storageAmount" column="storage_amount" />
<result property="occupyAmount" column="occupy_amount" />
<result property="lpn" column="lpn" />
<result property="productBatch" column="product_batch" />
<result property="receiveDate" column="receive_date" />
<result property="productDate" column="product_date" />
<result property="userDefined1" column="user_defined1" />
<result property="userDefined2" column="user_defined2" />
<result property="userDefined3" column="user_defined3" />
<result property="userDefined4" column="user_defined4" />
<result property="userDefined5" column="user_defined5" />
<result property="userDefined6" column="user_defined6" />
<result property="userDefined7" column="user_defined7" />
<result property="userDefined8" column="user_defined8" />
<result property="userDefined9" column="user_defined9" />
<result property="userDefined10" column="user_defined10" />
<result property="createBy" column="create_by" />
<result property="gmtCreate" column="gmt_create" />
<result property="lastModifiedBy" column="last_modified_by" />
<result property="gmtModified" column="gmt_modified" />
<result property="activeFlag" column="active_flag" />
<result property="factoryCode" column="factory_code" />
<result property="sapFactoryCode" column="sap_factory_code" />
<result property="wlName" column="wl_name" />
</resultMap>
<sql id="selectWmsFpStorageNewsVo">
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
</sql>
<select id="selectWmsFpStorageNewsList" parameterType="WmsFpStorageNews" resultMap="WmsFpStorageNewsResult">
<include refid="selectWmsFpStorageNewsVo"/>
<where>
<if test="storageId != null and storageId != ''"> and storage_id = #{storageId}</if>
<if test="whCode != null and whCode != ''"> and wh_code = #{whCode}</if>
<if test="regionCode != null and regionCode != ''"> and region_code = #{regionCode}</if>
<if test="waCode != null and waCode != ''"> and wa_code = #{waCode}</if>
<if test="storageType != null and storageType != ''"> and storage_type = #{storageType}</if>
<if test="wlCode != null and wlCode != ''"> and wl_code = #{wlCode}</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="amount != null "> and amount = #{amount}</if>
<if test="storageAmount != null "> and storage_amount = #{storageAmount}</if>
<if test="occupyAmount != null "> and occupy_amount = #{occupyAmount}</if>
<if test="lpn != null and lpn != ''"> and lpn = #{lpn}</if>
<if test="productBatch != null and productBatch != ''"> and product_batch = #{productBatch}</if>
<if test="receiveDate != null "> and receive_date = #{receiveDate}</if>
<if test="productDate != null "> and product_date = #{productDate}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''"> and user_defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''"> and user_defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''"> and user_defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''"> and user_defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''"> and user_defined10 = #{userDefined10}</if>
<if test="gmtCreate != null "> and gmt_create = #{gmtCreate}</if>
<if test="lastModifiedBy != null and lastModifiedBy != ''"> and last_modified_by = #{lastModifiedBy}</if>
<if test="gmtModified != null "> and gmt_modified = #{gmtModified}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="sapFactoryCode != null and sapFactoryCode != ''"> and sap_factory_code = #{sapFactoryCode}</if>
<if test="wlName != null and wlName != ''"> and wl_name like concat('%', #{wlName}, '%')</if>
</where>
</select>
<select id="selectWmsFpStorageNewsByStorageId" parameterType="String" resultMap="WmsFpStorageNewsResult">
<include refid="selectWmsFpStorageNewsVo"/>
where storage_id = #{storageId}
</select>
<!-- 根据产品编码查询库存主表-->
<select id="selectWmsFpStorageNewsByProductCode" resultMap="WmsFpStorageNewsResult">
SELECT
storage_id,
wh_code,
region_code,
wa_code,
storage_type,
wl_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
WHERE
product_code = #{productCode}
</select>
<select id="selectWmsFpStorageNewsByProductCodeAndWlCode" resultMap="WmsFpStorageNewsResult">
SELECT
storage_id,
wh_code,
region_code,
wa_code,
storage_type,
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
WHERE
product_code = #{productCode} and wl_code = #{wlCode}
</select>
<insert id="insertWmsFpStorageNews" parameterType="WmsFpStorageNews">
insert into wms_fp_storage_news
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="storageId != null and storageId != ''">storage_id,</if>
<if test="whCode != null">wh_code,</if>
<if test="regionCode != null">region_code,</if>
<if test="waCode != null">wa_code,</if>
<if test="storageType != null">storage_type,</if>
<if test="wlCode != null">wl_code,</if>
<if test="productCode != null">product_code,</if>
<if test="productName != null">product_name,</if>
<if test="amount != null">amount,</if>
<if test="storageAmount != null">storage_amount,</if>
<if test="occupyAmount != null">occupy_amount,</if>
<if test="lpn != null">lpn,</if>
<if test="productBatch != null">product_batch,</if>
<if test="receiveDate != null">receive_date,</if>
<if test="productDate != null">product_date,</if>
<if test="userDefined1 != null">user_defined1,</if>
<if test="userDefined2 != null">user_defined2,</if>
<if test="userDefined3 != null">user_defined3,</if>
<if test="userDefined4 != null">user_defined4,</if>
<if test="userDefined5 != null">user_defined5,</if>
<if test="userDefined6 != null">user_defined6,</if>
<if test="userDefined7 != null">user_defined7,</if>
<if test="userDefined8 != null">user_defined8,</if>
<if test="userDefined9 != null">user_defined9,</if>
<if test="userDefined10 != null">user_defined10,</if>
<if test="createBy != null">create_by,</if>
<if test="gmtCreate != null">gmt_create,</if>
<if test="lastModifiedBy != null">last_modified_by,</if>
<if test="gmtModified != null">gmt_modified,</if>
<if test="activeFlag != null">active_flag,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="sapFactoryCode != null">sap_factory_code,</if>
<if test="wlName != null">wl_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="storageId != null and storageId != ''">#{storageId},</if>
<if test="whCode != null">#{whCode},</if>
<if test="regionCode != null">#{regionCode},</if>
<if test="waCode != null">#{waCode},</if>
<if test="storageType != null">#{storageType},</if>
<if test="wlCode != null">#{wlCode},</if>
<if test="productCode != null">#{productCode},</if>
<if test="productName != null">#{productName},</if>
<if test="amount != null">#{amount},</if>
<if test="storageAmount != null">#{storageAmount},</if>
<if test="occupyAmount != null">#{occupyAmount},</if>
<if test="lpn != null">#{lpn},</if>
<if test="productBatch != null">#{productBatch},</if>
<if test="receiveDate != null">#{receiveDate},</if>
<if test="productDate != null">#{productDate},</if>
<if test="userDefined1 != null">#{userDefined1},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
<if test="userDefined6 != null">#{userDefined6},</if>
<if test="userDefined7 != null">#{userDefined7},</if>
<if test="userDefined8 != null">#{userDefined8},</if>
<if test="userDefined9 != null">#{userDefined9},</if>
<if test="userDefined10 != null">#{userDefined10},</if>
<if test="createBy != null">#{createBy},</if>
<if test="gmtCreate != null">#{gmtCreate},</if>
<if test="lastModifiedBy != null">#{lastModifiedBy},</if>
<if test="gmtModified != null">#{gmtModified},</if>
<if test="activeFlag != null">#{activeFlag},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="sapFactoryCode != null">#{sapFactoryCode},</if>
<if test="wlName != null">#{wlName},</if>
</trim>
</insert>
<update id="updateWmsFpStorageNews" parameterType="WmsFpStorageNews">
update wms_fp_storage_news
<trim prefix="SET" suffixOverrides=",">
<if test="whCode != null">wh_code = #{whCode},</if>
<if test="regionCode != null">region_code = #{regionCode},</if>
<if test="waCode != null">wa_code = #{waCode},</if>
<if test="storageType != null">storage_type = #{storageType},</if>
<if test="wlCode != null">wl_code = #{wlCode},</if>
<if test="productCode != null">product_code = #{productCode},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="amount != null">amount = #{amount},</if>
<if test="storageAmount != null">storage_amount = #{storageAmount},</if>
<if test="occupyAmount != null">occupy_amount = #{occupyAmount},</if>
<if test="lpn != null">lpn = #{lpn},</if>
<if test="productBatch != null">product_batch = #{productBatch},</if>
<if test="receiveDate != null">receive_date = #{receiveDate},</if>
<if test="productDate != null">product_date = #{productDate},</if>
<if test="userDefined1 != null">user_defined1 = #{userDefined1},</if>
<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
<if test="userDefined6 != null">user_defined6 = #{userDefined6},</if>
<if test="userDefined7 != null">user_defined7 = #{userDefined7},</if>
<if test="userDefined8 != null">user_defined8 = #{userDefined8},</if>
<if test="userDefined9 != null">user_defined9 = #{userDefined9},</if>
<if test="userDefined10 != null">user_defined10 = #{userDefined10},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
<if test="lastModifiedBy != null">last_modified_by = #{lastModifiedBy},</if>
<if test="gmtModified != null">gmt_modified = #{gmtModified},</if>
<if test="activeFlag != null">active_flag = #{activeFlag},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="sapFactoryCode != null">sap_factory_code = #{sapFactoryCode},</if>
<if test="wlName != null">wl_name = #{wlName},</if>
</trim>
where storage_id = #{storageId}
</update>
<delete id="deleteWmsFpStorageNewsByStorageId" parameterType="String">
delete from wms_fp_storage_news where storage_id = #{storageId}
</delete>
<delete id="deleteWmsFpStorageNewsByStorageIds" parameterType="String">
delete from wms_fp_storage_news where storage_id in
<foreach item="storageId" collection="array" open="(" separator="," close=")">
#{storageId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,215 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.WmsFpStorageNewsSnMapper">
<resultMap type="WmsFpStorageNewsSn" id="WmsFpStorageNewsSnResult">
<result property="storageId" column="storage_id" />
<result property="whCode" column="wh_code" />
<result property="waCode" column="wa_code" />
<result property="wlCode" column="wl_code" />
<result property="orderNo" column="order_no" />
<result property="productName" column="product_name" />
<result property="productCode" column="product_code" />
<result property="sn" column="sn" />
<result property="barCode" column="bar_code" />
<result property="amount" column="amount" />
<result property="userDefined1" column="user_defined1" />
<result property="userDefined2" column="user_defined2" />
<result property="userDefined3" column="user_defined3" />
<result property="userDefined4" column="user_defined4" />
<result property="userDefined5" column="user_defined5" />
<result property="userDefined6" column="user_defined6" />
<result property="userDefined7" column="user_defined7" />
<result property="userDefined8" column="user_defined8" />
<result property="userDefined9" column="user_defined9" />
<result property="userDefined10" column="user_defined10" />
<result property="createBy" column="create_by" />
<result property="gmtCreate" column="gmt_create" />
<result property="lastModifiedBy" column="last_modified_by" />
<result property="gmtModified" column="gmt_modified" />
<result property="activeFlag" column="active_flag" />
<result property="factoryCode" column="factory_code" />
<result property="sapFactoryCode" column="sap_factory_code" />
</resultMap>
<sql id="selectWmsFpStorageNewsSnVo">
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
</sql>
<select id="selectWmsFpStorageNewsSnList" parameterType="WmsFpStorageNewsSn" resultMap="WmsFpStorageNewsSnResult">
<include refid="selectWmsFpStorageNewsSnVo"/>
<where>
<if test="whCode != null and whCode != ''"> and wh_code = #{whCode}</if>
<if test="waCode != null and waCode != ''"> and wa_code = #{waCode}</if>
<if test="wlCode != null and wlCode != ''"> and wl_code = #{wlCode}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="sn != null and sn != ''"> and sn = #{sn}</if>
<if test="barCode != null and barCode != ''"> and bar_code = #{barCode}</if>
<if test="amount != null "> and amount = #{amount}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''"> and user_defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''"> and user_defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''"> and user_defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''"> and user_defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''"> and user_defined10 = #{userDefined10}</if>
<if test="gmtCreate != null "> and gmt_create = #{gmtCreate}</if>
<if test="lastModifiedBy != null and lastModifiedBy != ''"> and last_modified_by = #{lastModifiedBy}</if>
<if test="gmtModified != null "> and gmt_modified = #{gmtModified}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="sapFactoryCode != null and sapFactoryCode != ''"> and sap_factory_code = #{sapFactoryCode}</if>
</where>
</select>
<select id="selectWmsFpStorageNewsSnByStorageId" parameterType="String" resultMap="WmsFpStorageNewsSnResult">
<include refid="selectWmsFpStorageNewsSnVo"/>
where storage_id = #{storageId}
</select>
<!-- 根据库位,托盘号,产品编码查询库存主表-->
<select id="selectWmsFpStorageNewsSnBySnAndProductCodeAndWlCode" resultMap="WmsFpStorageNewsSnResult">
SELECT
active_flag,
amount,
bar_code,
create_by,
factory_code,
gmt_create,
gmt_modified,
last_modified_by,
order_no,
product_name,
sap_factory_code,
storage_id,
user_defined1,
user_defined10,
user_defined2,
user_defined3,
user_defined4,
user_defined5,
user_defined6,
user_defined7,
user_defined8,
user_defined9,
wa_code,
wh_code
FROM
wms_fp_storage_news_sn
WHERE
product_code = #{productCode} AND
sn = #{sn} and wl_code = #{wlCode}
</select>
<insert id="insertWmsFpStorageNewsSn" parameterType="WmsFpStorageNewsSn">
insert into wms_fp_storage_news_sn
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="storageId != null">storage_id,</if>
<if test="whCode != null">wh_code,</if>
<if test="waCode != null">wa_code,</if>
<if test="wlCode != null">wl_code,</if>
<if test="orderNo != null">order_no,</if>
<if test="productName != null">product_name,</if>
<if test="productCode != null">product_code,</if>
<if test="sn != null">sn,</if>
<if test="barCode != null">bar_code,</if>
<if test="amount != null">amount,</if>
<if test="userDefined1 != null">user_defined1,</if>
<if test="userDefined2 != null">user_defined2,</if>
<if test="userDefined3 != null">user_defined3,</if>
<if test="userDefined4 != null">user_defined4,</if>
<if test="userDefined5 != null">user_defined5,</if>
<if test="userDefined6 != null">user_defined6,</if>
<if test="userDefined7 != null">user_defined7,</if>
<if test="userDefined8 != null">user_defined8,</if>
<if test="userDefined9 != null">user_defined9,</if>
<if test="userDefined10 != null">user_defined10,</if>
<if test="createBy != null">create_by,</if>
<if test="gmtCreate != null">gmt_create,</if>
<if test="lastModifiedBy != null">last_modified_by,</if>
<if test="gmtModified != null">gmt_modified,</if>
<if test="activeFlag != null">active_flag,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="sapFactoryCode != null">sap_factory_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="storageId != null">#{storageId},</if>
<if test="whCode != null">#{whCode},</if>
<if test="waCode != null">#{waCode},</if>
<if test="wlCode != null">#{wlCode},</if>
<if test="orderNo != null">#{orderNo},</if>
<if test="productName != null">#{productName},</if>
<if test="productCode != null">#{productCode},</if>
<if test="sn != null">#{sn},</if>
<if test="barCode != null">#{barCode},</if>
<if test="amount != null">#{amount},</if>
<if test="userDefined1 != null">#{userDefined1},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
<if test="userDefined6 != null">#{userDefined6},</if>
<if test="userDefined7 != null">#{userDefined7},</if>
<if test="userDefined8 != null">#{userDefined8},</if>
<if test="userDefined9 != null">#{userDefined9},</if>
<if test="userDefined10 != null">#{userDefined10},</if>
<if test="createBy != null">#{createBy},</if>
<if test="gmtCreate != null">#{gmtCreate},</if>
<if test="lastModifiedBy != null">#{lastModifiedBy},</if>
<if test="gmtModified != null">#{gmtModified},</if>
<if test="activeFlag != null">#{activeFlag},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="sapFactoryCode != null">#{sapFactoryCode},</if>
</trim>
</insert>
<update id="updateWmsFpStorageNewsSn" parameterType="WmsFpStorageNewsSn">
update wms_fp_storage_news_sn
<trim prefix="SET" suffixOverrides=",">
<if test="whCode != null">wh_code = #{whCode},</if>
<if test="waCode != null">wa_code = #{waCode},</if>
<if test="wlCode != null">wl_code = #{wlCode},</if>
<if test="orderNo != null">order_no = #{orderNo},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="productCode != null">product_code = #{productCode},</if>
<if test="sn != null">sn = #{sn},</if>
<if test="barCode != null">bar_code = #{barCode},</if>
<if test="amount != null">amount = #{amount},</if>
<if test="userDefined1 != null">user_defined1 = #{userDefined1},</if>
<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
<if test="userDefined6 != null">user_defined6 = #{userDefined6},</if>
<if test="userDefined7 != null">user_defined7 = #{userDefined7},</if>
<if test="userDefined8 != null">user_defined8 = #{userDefined8},</if>
<if test="userDefined9 != null">user_defined9 = #{userDefined9},</if>
<if test="userDefined10 != null">user_defined10 = #{userDefined10},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
<if test="lastModifiedBy != null">last_modified_by = #{lastModifiedBy},</if>
<if test="gmtModified != null">gmt_modified = #{gmtModified},</if>
<if test="activeFlag != null">active_flag = #{activeFlag},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="sapFactoryCode != null">sap_factory_code = #{sapFactoryCode},</if>
</trim>
where storage_id = #{storageId}
</update>
<delete id="deleteWmsFpStorageNewsSnByStorageId" parameterType="String">
delete from wms_fp_storage_news_sn where storage_id = #{storageId}
</delete>
<delete id="deleteWmsFpStorageNewsSnByStorageIds" parameterType="String">
delete from wms_fp_storage_news_sn where storage_id in
<foreach item="storageId" collection="array" open="(" separator="," close=")">
#{storageId}
</foreach>
</delete>
</mapper>

@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="WmsProductPut" id="WmsProductPutResult">
<result property="id" column="id" />
<result property="workOrder" column="work_order" />
<result property="factoryCode" column="factory_code" />
<result property="productOrder" column="product_order" />
<result property="whCode" column="wh_code" />
@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sapProof" column="SAP_proof" />
<result property="sapMessage" column="SAP_message" />
<result property="putDate" column="put_date" />
<result property="attr1" column="attr1" />
<result property="batchNumber" column="batch_number" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
@ -40,12 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmsProductPutVo">
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
</sql>
<select id="selectWmsProductPutList" parameterType="WmsProductPut" resultMap="WmsProductPutResult">
<include refid="selectWmsProductPutVo"/>
<where>
<if test="workOrder != null and workOrder != ''"> and work_order = #{workOrder}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="productOrder != null and productOrder != ''"> and product_order = #{productOrder}</if>
<if test="whCode != null and whCode != ''"> and wh_code = #{whCode}</if>
@ -63,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sapProof != null and sapProof != ''"> and SAP_proof = #{sapProof}</if>
<if test="sapMessage != null and sapMessage != ''"> and SAP_message = #{sapMessage}</if>
<if test="putDate != null "> and put_date = #{putDate}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
@ -80,12 +82,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectWmsProductPutVo"/>
where id = #{id}
</select>
<insert id="insertWmsProductPut" parameterType="WmsProductPut">
<!-- 手持接口:根据报工单号查询展示-->
<select id="selectWmsProductPutByWorkOrder" resultMap="WmsProductPutResult">
SELECT
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,id
FROM
wms_product_put
WHERE
work_order =#{workOrder}
</select>
<insert id="insertWmsProductPut" parameterType="WmsProductPut">
insert into wms_product_put
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="workOrder != null and workOrder != ''">work_order,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="productOrder != null">product_order,</if>
<if test="whCode != null">wh_code,</if>
<if test="waCode != null">wa_code,</if>
@ -102,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sapProof != null">SAP_proof,</if>
<if test="sapMessage != null">SAP_message,</if>
<if test="putDate != null">put_date,</if>
<if test="attr1 != null">attr1,</if>
<if test="batchNumber != null">batch_number,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
@ -119,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="workOrder != null and workOrder != ''">#{workOrder},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="productOrder != null">#{productOrder},</if>
<if test="whCode != null">#{whCode},</if>
<if test="waCode != null">#{waCode},</if>
@ -136,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sapProof != null">#{sapProof},</if>
<if test="sapMessage != null">#{sapMessage},</if>
<if test="putDate != null">#{putDate},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="batchNumber != null">#{batch_number},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
@ -156,7 +172,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateWmsProductPut" parameterType="WmsProductPut">
update wms_product_put
<trim prefix="SET" suffixOverrides=",">
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="workOrder != null and workOrder != ''">work_order = #{workOrder},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="productOrder != null">product_order = #{productOrder},</if>
<if test="whCode != null">wh_code = #{whCode},</if>
<if test="waCode != null">wa_code = #{waCode},</if>
@ -173,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sapProof != null">SAP_proof = #{sapProof},</if>
<if test="sapMessage != null">SAP_message = #{sapMessage},</if>
<if test="putDate != null">put_date = #{putDate},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="batchNumber != null">batch_number = #{batchNumber},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>

@ -0,0 +1,139 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.WmsProductPutRecordsMapper">
<resultMap type="WmsProductPutRecords" id="WmsProductPutRecordsResult">
<result property="id" column="id" />
<result property="workOrder" column="work_order" />
<result property="productOrder" column="product_order" />
<result property="productName" column="product_name" />
<result property="productCode" column="product_code" />
<result property="whCode" column="wh_code" />
<result property="waCode" column="wa_code" />
<result property="wlCode" column="wl_code" />
<result property="sn" column="sn" />
<result property="number" column="number" />
<result property="userDefined1" column="user_defined1" />
<result property="userDefined2" column="user_defined2" />
<result property="userDefined3" column="user_defined3" />
<result property="userDefined4" column="user_defined4" />
<result property="userDefined5" column="user_defined5" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectWmsProductPutRecordsVo">
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
</sql>
<select id="selectWmsProductPutRecordsList" parameterType="WmsProductPutRecords" resultMap="WmsProductPutRecordsResult">
<include refid="selectWmsProductPutRecordsVo"/>
<where>
<if test="workOrder != null and workOrder != ''"> and work_order = #{workOrder}</if>
<if test="productOrder != null and productOrder != ''"> and product_order = #{productOrder}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="whCode != null and whCode != ''"> and wh_code = #{whCode}</if>
<if test="waCode != null and waCode != ''"> and wa_code = #{waCode}</if>
<if test="wlCode != null and wlCode != ''"> and wl_code = #{wlCode}</if>
<if test="sn != null and sn != ''"> and sn = #{sn}</if>
<if test="number != null and number != ''"> and number = #{number}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
</where>
</select>
<select id="selectWmsProductPutRecordsById" parameterType="String" resultMap="WmsProductPutRecordsResult">
<include refid="selectWmsProductPutRecordsVo"/>
where id = #{id}
</select>
<insert id="insertWmsProductPutRecords" parameterType="WmsProductPutRecords">
insert into wms_product_put_records
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="workOrder != null">work_order,</if>
<if test="productOrder != null">product_order,</if>
<if test="productName != null">product_name,</if>
<if test="productCode != null">product_code,</if>
<if test="whCode != null">wh_code,</if>
<if test="waCode != null">wa_code,</if>
<if test="wlCode != null">wl_code,</if>
<if test="sn != null">sn,</if>
<if test="number != null">number,</if>
<if test="userDefined1 != null">user_defined1,</if>
<if test="userDefined2 != null">user_defined2,</if>
<if test="userDefined3 != null">user_defined3,</if>
<if test="userDefined4 != null">user_defined4,</if>
<if test="userDefined5 != null">user_defined5,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="workOrder != null">#{workOrder},</if>
<if test="productOrder != null">#{productOrder},</if>
<if test="productName != null">#{productName},</if>
<if test="productCode != null">#{productCode},</if>
<if test="whCode != null">#{whCode},</if>
<if test="waCode != null">#{waCode},</if>
<if test="wlCode != null">#{wlCode},</if>
<if test="sn != null">#{sn},</if>
<if test="number != null">#{number},</if>
<if test="userDefined1 != null">#{userDefined1},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateWmsProductPutRecords" parameterType="WmsProductPutRecords">
update wms_product_put_records
<trim prefix="SET" suffixOverrides=",">
<if test="workOrder != null">work_order = #{workOrder},</if>
<if test="productOrder != null">product_order = #{productOrder},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="productCode != null">product_code = #{productCode},</if>
<if test="whCode != null">wh_code = #{whCode},</if>
<if test="waCode != null">wa_code = #{waCode},</if>
<if test="wlCode != null">wl_code = #{wlCode},</if>
<if test="sn != null">sn = #{sn},</if>
<if test="number != null">number = #{number},</if>
<if test="userDefined1 != null">user_defined1 = #{userDefined1},</if>
<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWmsProductPutRecordsById" parameterType="String">
delete from wms_product_put_records where id = #{id}
</delete>
<delete id="deleteWmsProductPutRecordsByIds" parameterType="String">
delete from wms_product_put_records where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.WmsProductPutTrayCodeMapper">
<resultMap type="WmsProductPutTrayCode" id="WmsProductPutTrayCodeResult">
<result property="storageId" column="storage_id" />
<result property="sn" column="sn" />
<result property="barcode" column="barcode" />
<result property="number" column="number" />
<result property="relatStatus" column="relat_status" />
<result property="userDefined1" column="user_defined1" />
<result property="userDefined2" column="user_defined2" />
<result property="userDefined3" column="user_defined3" />
<result property="userDefined4" column="user_defined4" />
<result property="userDefined5" column="user_defined5" />
</resultMap>
<sql id="selectWmsProductPutTrayCodeVo">
select storage_id, sn, barcode, number, relat_status, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5 from wms_product_put_tray_code
</sql>
<select id="selectWmsProductPutTrayCodeList" parameterType="WmsProductPutTrayCode" resultMap="WmsProductPutTrayCodeResult">
<include refid="selectWmsProductPutTrayCodeVo"/>
<where>
<if test="sn != null and sn != ''"> and sn = #{sn}</if>
<if test="barcode != null and barcode != ''"> and barcode = #{barcode}</if>
<if test="number != null and number != ''"> and number = #{number}</if>
<if test="relatStatus != null and relatStatus != ''"> and relat_status = #{relatStatus}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
</where>
</select>
<select id="selectWmsProductPutTrayCodeByStorageId" parameterType="String" resultMap="WmsProductPutTrayCodeResult">
<include refid="selectWmsProductPutTrayCodeVo"/>
where storage_id = #{storageId}
</select>
<!-- 根据托盘号查询关联状态-->
<select id="selectWmsProductPutTrayCodeBySn" resultMap="WmsProductPutTrayCodeResult">
SELECT
storage_id,barcode,number,relat_status,storage_id,user_defined1,user_defined2,user_defined3,user_defined4,user_defined5
FROM
wms_product_put_tray_code
WHERE
sn = #{sn}
</select>
<!-- 根据箱码查询托盘号-->
<select id="selectWmsProductPutTrayCodeByBarcode" resultMap="WmsProductPutTrayCodeResult">
SELECT
storage_id,sn,number,relat_status,storage_id,user_defined1,user_defined2,user_defined3,user_defined4,user_defined5
FROM
wms_product_put_tray_code
WHERE
barcode = #{barcode}
</select>
<insert id="insertWmsProductPutTrayCode" parameterType="WmsProductPutTrayCode">
insert into wms_product_put_tray_code
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="storageId != null">storage_id,</if>
<if test="sn != null">sn,</if>
<if test="barcode != null">barcode,</if>
<if test="number != null">number,</if>
<if test="relatStatus != null">relat_status,</if>
<if test="userDefined1 != null">user_defined1,</if>
<if test="userDefined2 != null">user_defined2,</if>
<if test="userDefined3 != null">user_defined3,</if>
<if test="userDefined4 != null">user_defined4,</if>
<if test="userDefined5 != null">user_defined5,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="storageId != null">#{storageId},</if>
<if test="sn != null">#{sn},</if>
<if test="barcode != null">#{barcode},</if>
<if test="number != null">#{number},</if>
<if test="relatStatus != null">#{relatStatus},</if>
<if test="userDefined1 != null">#{userDefined1},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
</trim>
</insert>
<update id="updateWmsProductPutTrayCode" parameterType="WmsProductPutTrayCode">
update wms_product_put_tray_code
<trim prefix="SET" suffixOverrides=",">
<if test="sn != null">sn = #{sn},</if>
<if test="barcode != null">barcode = #{barcode},</if>
<if test="number != null">number = #{number},</if>
<if test="relatStatus != null">relat_status = #{relatStatus},</if>
<if test="userDefined1 != null">user_defined1 = #{userDefined1},</if>
<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
</trim>
where storage_id = #{storageId}
</update>
<delete id="deleteWmsProductPutTrayCodeByStorageId" parameterType="String">
delete from wms_product_put_tray_code where storage_id = #{storageId}
</delete>
<delete id="deleteWmsProductPutTrayCodeByStorageIds" parameterType="String">
delete from wms_product_put_tray_code where storage_id in
<foreach item="storageId" collection="array" open="(" separator="," close=")">
#{storageId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.WmsProductPutTrayMapper">
<resultMap type="WmsProductPutTray" id="WmsProductPutTrayResult">
<result property="storageId" column="storage_id" />
<result property="workOrder" column="work_order" />
<result property="productOrder" column="product_order" />
<result property="whCode" column="wh_code" />
<result property="waCode" column="wa_code" />
<result property="wlCode" column="wl_code" />
<result property="sn" column="sn" />
<result property="number" column="number" />
<result property="batchNumber" column="batch_number" />
<result property="userDefined2" column="user_defined2" />
<result property="userDefined3" column="user_defined3" />
<result property="userDefined4" column="user_defined4" />
<result property="userDefined5" column="user_defined5" />
</resultMap>
<sql id="selectWmsProductPutTrayVo">
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
</sql>
<select id="selectWmsProductPutTrayList" parameterType="WmsProductPutTray" resultMap="WmsProductPutTrayResult">
<include refid="selectWmsProductPutTrayVo"/>
<where>
<if test="workOrder != null and workOrder != ''"> and work_order = #{workOrder}</if>
<if test="productOrder != null and productOrder != ''"> and product_order = #{productOrder}</if>
<if test="whCode != null and whCode != ''"> and wh_code = #{whCode}</if>
<if test="waCode != null and waCode != ''"> and wa_code = #{waCode}</if>
<if test="wlCode != null and wlCode != ''"> and wl_code = #{wlCode}</if>
<if test="sn != null and sn != ''"> and sn = #{sn}</if>
<if test="number != null and number != ''"> and number = #{number}</if>
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
</where>
</select>
<select id="selectWmsProductPutTrayByStorageId" parameterType="String" resultMap="WmsProductPutTrayResult">
<include refid="selectWmsProductPutTrayVo"/>
where storage_id = #{storageId}
</select>
<!-- 手持接口:根据报工单号查询所有托盘信息-->
<select id="selectWmsProductPutTrayByWorkOrder" resultMap="WmsProductPutTrayResult">
SELECT
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
WHERE
work_order =#{workOrder}
</select>
<insert id="insertWmsProductPutTray" parameterType="WmsProductPutTray">
insert into wms_product_put_tray
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="storageId != null">storage_id,</if>
<if test="workOrder != null">work_order,</if>
<if test="productOrder != null">product_order,</if>
<if test="whCode != null">wh_code,</if>
<if test="waCode != null">wa_code,</if>
<if test="wlCode != null">wl_code,</if>
<if test="sn != null">sn,</if>
<if test="number != null">number,</if>
<if test="batchNumber != null">batch_number,</if>
<if test="userDefined2 != null">user_defined2,</if>
<if test="userDefined3 != null">user_defined3,</if>
<if test="userDefined4 != null">user_defined4,</if>
<if test="userDefined5 != null">user_defined5,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="storageId != null">#{storageId},</if>
<if test="workOrder != null">#{workOrder},</if>
<if test="productOrder != null">#{productOrder},</if>
<if test="whCode != null">#{whCode},</if>
<if test="waCode != null">#{waCode},</if>
<if test="wlCode != null">#{wlCode},</if>
<if test="sn != null">#{sn},</if>
<if test="number != null">#{number},</if>
<if test="batchNumber != null">#{batch_number},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
</trim>
</insert>
<update id="updateWmsProductPutTray" parameterType="WmsProductPutTray">
update wms_product_put_tray
<trim prefix="SET" suffixOverrides=",">
<if test="workOrder != null">work_order = #{workOrder},</if>
<if test="productOrder != null">product_order = #{productOrder},</if>
<if test="whCode != null">wh_code = #{whCode},</if>
<if test="waCode != null">wa_code = #{waCode},</if>
<if test="wlCode != null">wl_code = #{wlCode},</if>
<if test="sn != null">sn = #{sn},</if>
<if test="number != null">number = #{number},</if>
<if test="batchNumber != null">batch_number = #{batchNumber},</if>
<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
</trim>
where storage_id = #{storageId}
</update>
<delete id="deleteWmsProductPutTrayByStorageId" parameterType="String">
delete from wms_product_put_tray where storage_id = #{storageId}
</delete>
<delete id="deleteWmsProductPutTrayByStorageIds" parameterType="String">
delete from wms_product_put_tray where storage_id in
<foreach item="storageId" collection="array" open="(" separator="," close=")">
#{storageId}
</foreach>
</delete>
<!-- 根据托盘号删除-->
<delete id="deleteWmsProductPutTrayBySn">
delete from wms_product_put_tray where sn = #{sn} and work_order = #{workOrder}
</delete>
</mapper>
Loading…
Cancel
Save