diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProductEmbryoInventoryController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProductEmbryoInventoryController.java new file mode 100644 index 00000000..a885bccf --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProductEmbryoInventoryController.java @@ -0,0 +1,98 @@ +package com.op.wms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.wms.domain.OdsProductEmbryoInventory; +import com.op.wms.service.IOdsProductEmbryoInventoryService; +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.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 2024-04-10 + */ +@RestController +@RequestMapping("/systemFinished") +public class OdsProductEmbryoInventoryController extends BaseController { + @Autowired + private IOdsProductEmbryoInventoryService odsProductEmbryoInventoryService; + +/** + * 查询成品盘点单列表 + */ +@RequiresPermissions("systemFinished:systemFinished :list") +@GetMapping("/list") + public TableDataInfo list(OdsProductEmbryoInventory odsProductEmbryoInventory) { + startPage(); + List list = odsProductEmbryoInventoryService.selectOdsProductEmbryoInventoryList(odsProductEmbryoInventory); + return getDataTable(list); + } + + /** + * 导出成品盘点单列表 + */ + @RequiresPermissions("systemFinished:systemFinished :export") + @Log(title = "成品盘点单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OdsProductEmbryoInventory odsProductEmbryoInventory) { + List list = odsProductEmbryoInventoryService.selectOdsProductEmbryoInventoryList(odsProductEmbryoInventory); + ExcelUtil util = new ExcelUtil(OdsProductEmbryoInventory. class); + util.exportExcel(response, list, "成品盘点单数据"); + } + + /** + * 获取成品盘点单详细信息 + */ + @RequiresPermissions("systemFinished:systemFinished :query") + @GetMapping(value = "/{ID}") + public AjaxResult getInfo(@PathVariable("ID") String ID) { + return success(odsProductEmbryoInventoryService.selectOdsProductEmbryoInventoryByID(ID)); + } + + /** + * 新增成品盘点单 + */ + @RequiresPermissions("systemFinished:systemFinished :add") + @Log(title = "成品盘点单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) { + return toAjax(odsProductEmbryoInventoryService.insertOdsProductEmbryoInventory(odsProductEmbryoInventory)); + } + + /** + * 修改成品盘点单 + */ + @RequiresPermissions("systemFinished:systemFinished :edit") + @Log(title = "成品盘点单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) { + return toAjax(odsProductEmbryoInventoryService.updateOdsProductEmbryoInventory(odsProductEmbryoInventory)); + } + + /** + * 删除成品盘点单 + */ + @RequiresPermissions("systemFinished:systemFinished :remove") + @Log(title = "成品盘点单", businessType = BusinessType.DELETE) + @DeleteMapping("/{IDs}") + public AjaxResult remove(@PathVariable String[] IDs) { + return toAjax(odsProductEmbryoInventoryService.deleteOdsProductEmbryoInventoryByIDs(IDs)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java index 553129db..84b0b538 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java @@ -44,6 +44,16 @@ public class WmsFpStorageNewsSnController extends BaseController { List list = wmsFpStorageNewsSnService.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); return getDataTable(list); } + /** + * 查询成品库存明细列表 + */ + + @GetMapping("/listunt") + public TableDataInfo listunt(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + startPage(); + List list = wmsFpStorageNewsSnService.selectWmsFpStorageNewsSnListunt(wmsFpStorageNewsSn); + return getDataTable(list); + } /** * 导出成品库存明细列表 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java index a4b7f01c..dd41ea63 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java @@ -136,4 +136,6 @@ public class WmsProductPutController extends BaseController { String rlist = wmsProductPutService.addReportListSap(mesReportWork); return AjaxResult.success(rlist); } + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProductEmbryoInventory.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProductEmbryoInventory.java new file mode 100644 index 00000000..f4fee6a7 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProductEmbryoInventory.java @@ -0,0 +1,379 @@ +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; + +/** + * 成品盘点单对象 ods_product_embryo_inventory + * + * @author Open Platform + * @date 2024-04-10 + */ +public class OdsProductEmbryoInventory extends BaseEntity { +private static final long serialVersionUID=1L; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String siteCode; + + /** ID */ + private String ID; + + /** 盘点单号 */ + @Excel(name = "盘点单号") + private String orderCode; + + /** 型号编码 */ + @Excel(name = "型号编码") + private String materialCode; + /** 型号编码 */ + @Excel(name = "备注") + private String Remark; + + @Override + public String getRemark() { + return Remark; + } + + @Override + public void setRemark(String remark) { + Remark = remark; + } + + /** 型号名称 */ + @Excel(name = "型号名称") + private String materialDesc; + + /** 计划日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date planDate; + + /** 库存数量 */ + @Excel(name = "库存数量") + private BigDecimal locNumber; + + /** 单位 */ + @Excel(name = "单位") + private String Unit; + + /** 实际数量 */ + @Excel(name = "实际数量") + private BigDecimal realityNumber; + + /** 订单状态 */ + @Excel(name = "订单状态") + private String orderStatus; + + /** 用户自定义属性2 */ + @Excel(name = "用户自定义属性2") + private String userDefined1; + + /** 库位 */ + @Excel(name = "库位") + private String locCode; + + /** 用户自定义属性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; + + /** 用户自定义属性11 */ + @Excel(name = "用户自定义属性11") + private String userDefined11; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 最后更新人 */ + @Excel(name = "最后更新人") + private String lastUpdateBy; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastUpdateDate; + + /** 可用标识 */ + @Excel(name = "可用标识") + private String Active; + + /** 企业主键 */ + @Excel(name = "企业主键") + private String enterpriseId; + + /** 企业编码 */ + @Excel(name = "企业编码") + private String enterpriseCode; + + public void setSiteCode(String siteCode){ + this.siteCode = siteCode; + } + + public String getSiteCode(){ + return siteCode; + } + public void setID(String ID){ + this.ID = ID; + } + + public String getID(){ + return ID; + } + public void setOrderCode(String orderCode){ + this.orderCode = orderCode; + } + + public String getOrderCode(){ + return orderCode; + } + public void setMaterialCode(String materialCode){ + this.materialCode = materialCode; + } + + public String getMaterialCode(){ + return materialCode; + } + public void setMaterialDesc(String materialDesc){ + this.materialDesc = materialDesc; + } + + public String getMaterialDesc(){ + return materialDesc; + } + public void setPlanDate(Date planDate){ + this.planDate = planDate; + } + + public Date getPlanDate(){ + return planDate; + } + public void setLocNumber(BigDecimal locNumber){ + this.locNumber = locNumber; + } + + public BigDecimal getLocNumber(){ + return locNumber; + } + public void setUnit(String Unit){ + this.Unit = Unit; + } + + public String getUnit(){ + return Unit; + } + public void setRealityNumber(BigDecimal realityNumber){ + this.realityNumber = realityNumber; + } + + public BigDecimal getRealityNumber(){ + return realityNumber; + } + public void setOrderStatus(String orderStatus){ + this.orderStatus = orderStatus; + } + + public String getOrderStatus(){ + return orderStatus; + } + public void setUserDefined1(String userDefined1){ + this.userDefined1 = userDefined1; + } + + public String getUserDefined1(){ + return userDefined1; + } + public void setLocCode(String locCode){ + this.locCode = locCode; + } + + public String getLocCode(){ + return locCode; + } + 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 setUserDefined11(String userDefined11){ + this.userDefined11 = userDefined11; + } + + public String getUserDefined11(){ + return userDefined11; + } + public void setCreateDate(Date createDate){ + this.createDate = createDate; + } + + public Date getCreateDate(){ + return createDate; + } + public void setLastUpdateBy(String lastUpdateBy){ + this.lastUpdateBy = lastUpdateBy; + } + + public String getLastUpdateBy(){ + return lastUpdateBy; + } + public void setLastUpdateDate(Date lastUpdateDate){ + this.lastUpdateDate = lastUpdateDate; + } + + public Date getLastUpdateDate(){ + return lastUpdateDate; + } + public void setActive(String Active){ + this.Active = Active; + } + + public String getActive(){ + return Active; + } + public void setEnterpriseId(String enterpriseId){ + this.enterpriseId = enterpriseId; + } + + public String getEnterpriseId(){ + return enterpriseId; + } + public void setEnterpriseCode(String enterpriseCode){ + this.enterpriseCode = enterpriseCode; + } + + public String getEnterpriseCode(){ + return enterpriseCode; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("siteCode",getSiteCode()) + .append("ID",getID()) + .append("orderCode",getOrderCode()) + .append("materialCode",getMaterialCode()) + .append("materialDesc",getMaterialDesc()) + .append("planDate",getPlanDate()) + .append("locNumber",getLocNumber()) + .append("Unit",getUnit()) + .append("realityNumber",getRealityNumber()) + .append("orderStatus",getOrderStatus()) + .append("userDefined1",getUserDefined1()) + .append("locCode",getLocCode()) + .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("userDefined11",getUserDefined11()) + .append("Remark",getRemark()) + .append("createBy",getCreateBy()) + .append("createDate",getCreateDate()) + .append("lastUpdateBy",getLastUpdateBy()) + .append("lastUpdateDate",getLastUpdateDate()) + .append("Active",getActive()) + .append("enterpriseId",getEnterpriseId()) + .append("enterpriseCode",getEnterpriseCode()) + .toString(); + } + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java index 0a168482..76f5da3f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java @@ -146,6 +146,17 @@ public class WmsFpStorageNewsSn extends BaseEntity { @Excel(name = "备用9") private String userDefined9; + @Excel(name = "单位") + private String unit; + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + /** * 备用10 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProductEmbryoInventoryMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProductEmbryoInventoryMapper.java new file mode 100644 index 00000000..aedc33be --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProductEmbryoInventoryMapper.java @@ -0,0 +1,61 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.op.wms.domain.OdsProductEmbryoInventory; + +/** + * 成品盘点单Mapper接口 + * + * @author Open Platform + * @date 2024-04-10 + */ +public interface OdsProductEmbryoInventoryMapper { + /** + * 查询成品盘点单 + * + * @param ID 成品盘点单主键 + * @return 成品盘点单 + */ + public OdsProductEmbryoInventory selectOdsProductEmbryoInventoryByID(String ID); + + /** + * 查询成品盘点单列表 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 成品盘点单集合 + */ + public List selectOdsProductEmbryoInventoryList(OdsProductEmbryoInventory odsProductEmbryoInventory); + + /** + * 新增成品盘点单 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 结果 + */ + public int insertOdsProductEmbryoInventory(OdsProductEmbryoInventory odsProductEmbryoInventory); + + /** + * 修改成品盘点单 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 结果 + */ + public int updateOdsProductEmbryoInventory(OdsProductEmbryoInventory odsProductEmbryoInventory); + + /** + * 删除成品盘点单 + * + * @param ID 成品盘点单主键 + * @return 结果 + */ + public int deleteOdsProductEmbryoInventoryByID(String ID); + + /** + * 批量删除成品盘点单 + * + * @param IDs 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOdsProductEmbryoInventoryByIDs(String[] IDs); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java index ef4f5d3a..aa4ae031 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java @@ -78,4 +78,6 @@ public interface WmsFpStorageNewsSnMapper { public WmsFpStorageNewsSn selectWmsFpStorageNewsSnBySnAndProductCode(@Param("sn") String sn, @Param("productCode") String productCode); void updateWmsFpStorageNewsSnOut(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + String selectwmsFpStorageNews(WmsFpStorageNewsSn wmsFpStorageNewsSn1); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProductEmbryoInventoryService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProductEmbryoInventoryService.java new file mode 100644 index 00000000..c2b2dcef --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProductEmbryoInventoryService.java @@ -0,0 +1,61 @@ +package com.op.wms.service; + +import java.util.List; + +import com.op.wms.domain.OdsProductEmbryoInventory; + +/** + * 成品盘点单Service接口 + * + * @author Open Platform + * @date 2024-04-10 + */ +public interface IOdsProductEmbryoInventoryService { + /** + * 查询成品盘点单 + * + * @param ID 成品盘点单主键 + * @return 成品盘点单 + */ + public OdsProductEmbryoInventory selectOdsProductEmbryoInventoryByID(String ID); + + /** + * 查询成品盘点单列表 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 成品盘点单集合 + */ + public List selectOdsProductEmbryoInventoryList(OdsProductEmbryoInventory odsProductEmbryoInventory); + + /** + * 新增成品盘点单 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 结果 + */ + public int insertOdsProductEmbryoInventory(OdsProductEmbryoInventory odsProductEmbryoInventory); + + /** + * 修改成品盘点单 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 结果 + */ + public int updateOdsProductEmbryoInventory(OdsProductEmbryoInventory odsProductEmbryoInventory); + + /** + * 批量删除成品盘点单 + * + * @param IDs 需要删除的成品盘点单主键集合 + * @return 结果 + */ + public int deleteOdsProductEmbryoInventoryByIDs(String[] IDs); + + /** + * 删除成品盘点单信息 + * + * @param ID 成品盘点单主键 + * @return 结果 + */ + public int deleteOdsProductEmbryoInventoryByID(String ID); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java index 5d7279e6..ff1de4d4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java @@ -60,4 +60,5 @@ public interface IWmsFpStorageNewsSnService { public int deleteWmsFpStorageNewsSnByStorageId(String storageId); + List selectWmsFpStorageNewsSnListunt(WmsFpStorageNewsSn wmsFpStorageNewsSn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProductEmbryoInventoryServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProductEmbryoInventoryServiceImpl.java new file mode 100644 index 00000000..fd4877dd --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProductEmbryoInventoryServiceImpl.java @@ -0,0 +1,95 @@ +package com.op.wms.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.wms.domain.OdsProductEmbryoInventory; +import com.op.wms.mapper.OdsProductEmbryoInventoryMapper; +import com.op.wms.service.IOdsProductEmbryoInventoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 成品盘点单Service业务层处理 + * + * @author Open Platform + * @date 2024-04-10 + */ +@Service +public class OdsProductEmbryoInventoryServiceImpl implements IOdsProductEmbryoInventoryService { + @Autowired + private OdsProductEmbryoInventoryMapper odsProductEmbryoInventoryMapper; + + /** + * 查询成品盘点单 + * + * @param ID 成品盘点单主键 + * @return 成品盘点单 + */ + @Override + @DS("#header.poolName") + public OdsProductEmbryoInventory selectOdsProductEmbryoInventoryByID(String ID) { + return odsProductEmbryoInventoryMapper.selectOdsProductEmbryoInventoryByID(ID); + } + + /** + * 查询成品盘点单列表 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 成品盘点单 + */ + @Override + @DS("#header.poolName") + public List selectOdsProductEmbryoInventoryList(OdsProductEmbryoInventory odsProductEmbryoInventory) { + return odsProductEmbryoInventoryMapper.selectOdsProductEmbryoInventoryList(odsProductEmbryoInventory); + } + + /** + * 新增成品盘点单 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertOdsProductEmbryoInventory(OdsProductEmbryoInventory odsProductEmbryoInventory) { + return odsProductEmbryoInventoryMapper.insertOdsProductEmbryoInventory(odsProductEmbryoInventory); + } + + /** + * 修改成品盘点单 + * + * @param odsProductEmbryoInventory 成品盘点单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateOdsProductEmbryoInventory(OdsProductEmbryoInventory odsProductEmbryoInventory) { + return odsProductEmbryoInventoryMapper.updateOdsProductEmbryoInventory(odsProductEmbryoInventory); + } + + /** + * 批量删除成品盘点单 + * + * @param IDs 需要删除的成品盘点单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteOdsProductEmbryoInventoryByIDs(String[] IDs) { + return odsProductEmbryoInventoryMapper.deleteOdsProductEmbryoInventoryByIDs(IDs); + } + + /** + * 删除成品盘点单信息 + * + * @param ID 成品盘点单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteOdsProductEmbryoInventoryByID(String ID) { + return odsProductEmbryoInventoryMapper.deleteOdsProductEmbryoInventoryByID(ID); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java index f337a631..5cdc7392 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java @@ -91,4 +91,16 @@ public class WmsFpStorageNewsSnServiceImpl implements IWmsFpStorageNewsSnService public int deleteWmsFpStorageNewsSnByStorageId(String storageId) { return wmsFpStorageNewsSnMapper.deleteWmsFpStorageNewsSnByStorageId(storageId); } + + @Override + @DS("#header.poolName") + public List selectWmsFpStorageNewsSnListunt(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + List wmsFpStorageNewsSnList= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + for ( WmsFpStorageNewsSn wmsFpStorageNewsSn1 : + wmsFpStorageNewsSnList ) { + String unit= wmsFpStorageNewsSnMapper.selectwmsFpStorageNews(wmsFpStorageNewsSn1); + wmsFpStorageNewsSn1.setUnit(unit); + } + return wmsFpStorageNewsSnList; + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProductEmbryoInventoryMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProductEmbryoInventoryMapper.xml new file mode 100644 index 00000000..2c9f65f9 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProductEmbryoInventoryMapper.xml @@ -0,0 +1,375 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Loc_Number, Unit, Reality_Number, Order_Status, User_Defined1, Loc_Code, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code from ods_product_embryo_inventory + + + + + + + + insert into ods_product_embryo_inventory + + Site_code, + + ID, + + Order_Code, + + Material_Code, + + Material_Desc, + + Plan_Date, + + Loc_Number, + + Unit, + + Reality_Number, + + Order_Status, + + User_Defined1, + + Loc_Code, + + User_Defined2, + + User_Defined3, + + User_Defined4, + + User_Defined5, + + User_Defined6, + + User_Defined7, + + User_Defined8, + + User_Defined9, + + User_Defined10, + + User_Defined11, + + Remark, + + Create_By, + + Create_Date, + + Last_Update_By, + + Last_Update_Date, + + Active, + + Enterprise_Id, + + Enterprise_Code, + + + + #{siteCode}, + + #{ID}, + + #{orderCode}, + + #{materialCode}, + + #{materialDesc}, + + #{planDate}, + + #{locNumber}, + + #{Unit}, + + #{realityNumber}, + + #{orderStatus}, + + #{userDefined1}, + + #{locCode}, + + #{userDefined2}, + + #{userDefined3}, + + #{userDefined4}, + + #{userDefined5}, + + #{userDefined6}, + + #{userDefined7}, + + #{userDefined8}, + + #{userDefined9}, + + #{userDefined10}, + + #{userDefined11}, + + #{Remark}, + + #{createBy}, + + #{createDate}, + + #{lastUpdateBy}, + + #{lastUpdateDate}, + + #{Active}, + + #{enterpriseId}, + + #{enterpriseCode}, + + + + + + update ods_product_embryo_inventory + + Site_code = + #{siteCode}, + + Order_Code = + #{orderCode}, + + Material_Code = + #{materialCode}, + + Material_Desc = + #{materialDesc}, + + Plan_Date = + #{planDate}, + + Loc_Number = + #{locNumber}, + + Unit = + #{Unit}, + + Reality_Number = + #{realityNumber}, + + Order_Status = + #{orderStatus}, + + User_Defined1 = + #{userDefined1}, + + Loc_Code = + #{locCode}, + + User_Defined2 = + #{userDefined2}, + + User_Defined3 = + #{userDefined3}, + + User_Defined4 = + #{userDefined4}, + + User_Defined5 = + #{userDefined5}, + + User_Defined6 = + #{userDefined6}, + + User_Defined7 = + #{userDefined7}, + + User_Defined8 = + #{userDefined8}, + + User_Defined9 = + #{userDefined9}, + + User_Defined10 = + #{userDefined10}, + + User_Defined11 = + #{userDefined11}, + + Remark = + #{Remark}, + + Create_By = + #{createBy}, + + Create_Date = + #{createDate}, + + Last_Update_By = + #{lastUpdateBy}, + + Last_Update_Date = + #{lastUpdateDate}, + + Active = + #{Active}, + + Enterprise_Id = + #{enterpriseId}, + + Enterprise_Code = + #{enterpriseCode}, + + + where ID = #{ID} + + + + delete from ods_product_embryo_inventory where ID = #{ID} + + + + delete from ods_product_embryo_inventory where ID in + + #{ID} + + + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml index 9210d715..3d4aebe3 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml @@ -253,4 +253,8 @@ set user_defined2 = COALESCE(user_defined2, 0) + 1 where sn=#{sn} and active_flag='1' + +