diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/controller/InStockinDetailFinishController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/controller/InStockinDetailFinishController.java new file mode 100644 index 0000000..29af2c6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/controller/InStockinDetailFinishController.java @@ -0,0 +1,104 @@ +package com.ruoyi.in.stockindetailfinish.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish; +import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 历史入库单据子信息Controller + * + * @author ruoyi + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/in/stockinDetailFinish") +public class InStockinDetailFinishController extends BaseController +{ + @Autowired + private IInStockinDetailFinishService inStockinDetailFinishService; + + /** + * 查询历史入库单据子信息列表 + */ + @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:list')") + @GetMapping("/list") + public TableDataInfo list(InStockinDetailFinish inStockinDetailFinish) + { + startPage(); + List list = inStockinDetailFinishService.selectInStockinDetailFinishList(inStockinDetailFinish); + return getDataTable(list); + } + + /** + * 导出历史入库单据子信息列表 + */ + @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:export')") + @Log(title = "历史入库单据子信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, InStockinDetailFinish inStockinDetailFinish) + { + List list = inStockinDetailFinishService.selectInStockinDetailFinishList(inStockinDetailFinish); + ExcelUtil util = new ExcelUtil(InStockinDetailFinish.class); + util.exportExcel(response, list, "历史入库单据子信息数据"); + } + + /** + * 获取历史入库单据子信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:query')") + @GetMapping(value = "/{stockinDetailId}") + public AjaxResult getInfo(@PathVariable("stockinDetailId") String stockinDetailId) + { + return success(inStockinDetailFinishService.selectInStockinDetailFinishByStockinDetailId(stockinDetailId)); + } + + /** + * 新增历史入库单据子信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:add')") + @Log(title = "历史入库单据子信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody InStockinDetailFinish inStockinDetailFinish) + { + return toAjax(inStockinDetailFinishService.insertInStockinDetailFinish(inStockinDetailFinish)); + } + + /** + * 修改历史入库单据子信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:edit')") + @Log(title = "历史入库单据子信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody InStockinDetailFinish inStockinDetailFinish) + { + return toAjax(inStockinDetailFinishService.updateInStockinDetailFinish(inStockinDetailFinish)); + } + + /** + * 删除历史入库单据子信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:remove')") + @Log(title = "历史入库单据子信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{stockinDetailIds}") + public AjaxResult remove(@PathVariable String[] stockinDetailIds) + { + return toAjax(inStockinDetailFinishService.deleteInStockinDetailFinishByStockinDetailIds(stockinDetailIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java new file mode 100644 index 0000000..50c90dd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java @@ -0,0 +1,458 @@ +package com.ruoyi.in.stockindetailfinish.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 历史入库单据子信息对象 in_stockin_detail_finish + * + * @author ruoyi + * @date 2025-05-28 + */ +public class InStockinDetailFinish extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 子单ID */ + private String stockinDetailId; + + /** 主单GUID */ + @Excel(name = "主单GUID") + private String stockinGuid; + + /** 主单ID */ + @Excel(name = "主单ID") + private String stockinId; + + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; + + /** 物料ID */ + @Excel(name = "物料ID") + private String productGuid; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String productId; + + /** 计划数量 */ + @Excel(name = "计划数量") + private String quantity; + + /** 计划数量(箱) */ + @Excel(name = "计划数量(箱)") + private String quantityX; + + /** 计划数量(件) */ + @Excel(name = "计划数量(件)") + private String quantityJ; + + /** 参考单价 */ + @Excel(name = "参考单价") + private String price; + + /** 品牌 */ + @Excel(name = "品牌") + private String cargoNo; + + /** 实际数量 */ + @Excel(name = "实际数量") + private String assignNum; + + /** 实际数量(箱) */ + @Excel(name = "实际数量(箱)") + private String assignNumX; + + /** 实际数量(件) */ + @Excel(name = "实际数量(件)") + private String assignNumJ; + + /** 入库日期 */ + @Excel(name = "入库日期") + private String printDate; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String stockStatus; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String supplierId; + + /** 客户编码 */ + @Excel(name = "客户编码") + private String customerId; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 规格 */ + @Excel(name = "规格") + private String spec; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String spare1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String spare2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String spare3; + + /** 备用字段4 */ + @Excel(name = "备用字段4") + private String spare4; + + /** 备用字段5 */ + @Excel(name = "备用字段5") + private String spare5; + + /** 备用字段6 */ + @Excel(name = "备用字段6") + private String spare6; + + /** 扫码数量 */ + @Excel(name = "扫码数量") + private String scanNum; + + /** 扫码数量(箱) */ + @Excel(name = "扫码数量(箱)") + private String scanNumX; + + /** 扫码数量(件) */ + @Excel(name = "扫码数量(件)") + private String scanNumJ; + + public void setStockinDetailId(String stockinDetailId) + { + this.stockinDetailId = stockinDetailId; + } + + public String getStockinDetailId() + { + return stockinDetailId; + } + + public void setStockinGuid(String stockinGuid) + { + this.stockinGuid = stockinGuid; + } + + public String getStockinGuid() + { + return stockinGuid; + } + + public void setStockinId(String stockinId) + { + this.stockinId = stockinId; + } + + public String getStockinId() + { + return stockinId; + } + + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setProductGuid(String productGuid) + { + this.productGuid = productGuid; + } + + public String getProductGuid() + { + return productGuid; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setQuantity(String quantity) + { + this.quantity = quantity; + } + + public String getQuantity() + { + return quantity; + } + + public void setQuantityX(String quantityX) + { + this.quantityX = quantityX; + } + + public String getQuantityX() + { + return quantityX; + } + + public void setQuantityJ(String quantityJ) + { + this.quantityJ = quantityJ; + } + + public String getQuantityJ() + { + return quantityJ; + } + + public void setPrice(String price) + { + this.price = price; + } + + public String getPrice() + { + return price; + } + + public void setCargoNo(String cargoNo) + { + this.cargoNo = cargoNo; + } + + public String getCargoNo() + { + return cargoNo; + } + + public void setAssignNum(String assignNum) + { + this.assignNum = assignNum; + } + + public String getAssignNum() + { + return assignNum; + } + + public void setAssignNumX(String assignNumX) + { + this.assignNumX = assignNumX; + } + + public String getAssignNumX() + { + return assignNumX; + } + + public void setAssignNumJ(String assignNumJ) + { + this.assignNumJ = assignNumJ; + } + + public String getAssignNumJ() + { + return assignNumJ; + } + + public void setPrintDate(String printDate) + { + this.printDate = printDate; + } + + public String getPrintDate() + { + return printDate; + } + + public void setStockStatus(String stockStatus) + { + this.stockStatus = stockStatus; + } + + public String getStockStatus() + { + return stockStatus; + } + + public void setSupplierId(String supplierId) + { + this.supplierId = supplierId; + } + + public String getSupplierId() + { + return supplierId; + } + + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + + public void setSpec(String spec) + { + this.spec = spec; + } + + public String getSpec() + { + return spec; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + public void setSpare5(String spare5) + { + this.spare5 = spare5; + } + + public String getSpare5() + { + return spare5; + } + + public void setSpare6(String spare6) + { + this.spare6 = spare6; + } + + public String getSpare6() + { + return spare6; + } + + public void setScanNum(String scanNum) + { + this.scanNum = scanNum; + } + + public String getScanNum() + { + return scanNum; + } + + public void setScanNumX(String scanNumX) + { + this.scanNumX = scanNumX; + } + + public String getScanNumX() + { + return scanNumX; + } + + public void setScanNumJ(String scanNumJ) + { + this.scanNumJ = scanNumJ; + } + + public String getScanNumJ() + { + return scanNumJ; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockinDetailId", getStockinDetailId()) + .append("stockinGuid", getStockinGuid()) + .append("stockinId", getStockinId()) + .append("lotNo", getLotNo()) + .append("productGuid", getProductGuid()) + .append("productId", getProductId()) + .append("quantity", getQuantity()) + .append("quantityX", getQuantityX()) + .append("quantityJ", getQuantityJ()) + .append("price", getPrice()) + .append("cargoNo", getCargoNo()) + .append("remark", getRemark()) + .append("assignNum", getAssignNum()) + .append("assignNumX", getAssignNumX()) + .append("assignNumJ", getAssignNumJ()) + .append("printDate", getPrintDate()) + .append("stockStatus", getStockStatus()) + .append("supplierId", getSupplierId()) + .append("customerId", getCustomerId()) + .append("unit", getUnit()) + .append("spec", getSpec()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("spare5", getSpare5()) + .append("spare6", getSpare6()) + .append("scanNum", getScanNum()) + .append("scanNumX", getScanNumX()) + .append("scanNumJ", getScanNumJ()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java new file mode 100644 index 0000000..45d65c2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.in.stockindetailfinish.mapper; + +import java.util.List; +import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish; + +/** + * 历史入库单据子信息Mapper接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface InStockinDetailFinishMapper +{ + /** + * 查询历史入库单据子信息 + * + * @param stockinDetailId 历史入库单据子信息主键 + * @return 历史入库单据子信息 + */ + public InStockinDetailFinish selectInStockinDetailFinishByStockinDetailId(String stockinDetailId); + + /** + * 查询历史入库单据子信息列表 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 历史入库单据子信息集合 + */ + public List selectInStockinDetailFinishList(InStockinDetailFinish inStockinDetailFinish); + + /** + * 新增历史入库单据子信息 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 结果 + */ + public int insertInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish); + + /** + * 修改历史入库单据子信息 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 结果 + */ + public int updateInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish); + + /** + * 删除历史入库单据子信息 + * + * @param stockinDetailId 历史入库单据子信息主键 + * @return 结果 + */ + public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId); + + /** + * 批量删除历史入库单据子信息 + * + * @param stockinDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java new file mode 100644 index 0000000..5562e29 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java @@ -0,0 +1,61 @@ +package com.ruoyi.in.stockindetailfinish.service; + +import java.util.List; +import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish; + +/** + * 历史入库单据子信息Service接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface IInStockinDetailFinishService +{ + /** + * 查询历史入库单据子信息 + * + * @param stockinDetailId 历史入库单据子信息主键 + * @return 历史入库单据子信息 + */ + public InStockinDetailFinish selectInStockinDetailFinishByStockinDetailId(String stockinDetailId); + + /** + * 查询历史入库单据子信息列表 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 历史入库单据子信息集合 + */ + public List selectInStockinDetailFinishList(InStockinDetailFinish inStockinDetailFinish); + + /** + * 新增历史入库单据子信息 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 结果 + */ + public int insertInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish); + + /** + * 修改历史入库单据子信息 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 结果 + */ + public int updateInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish); + + /** + * 批量删除历史入库单据子信息 + * + * @param stockinDetailIds 需要删除的历史入库单据子信息主键集合 + * @return 结果 + */ + public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds); + + /** + * 删除历史入库单据子信息信息 + * + * @param stockinDetailId 历史入库单据子信息主键 + * @return 结果 + */ + public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java new file mode 100644 index 0000000..eff7737 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.in.stockindetailfinish.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper; +import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish; +import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService; + +/** + * 历史入库单据子信息Service业务层处理 + * + * @author ruoyi + * @date 2025-05-28 + */ +@Service +public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService +{ + @Autowired + private InStockinDetailFinishMapper inStockinDetailFinishMapper; + + /** + * 查询历史入库单据子信息 + * + * @param stockinDetailId 历史入库单据子信息主键 + * @return 历史入库单据子信息 + */ + @Override + public InStockinDetailFinish selectInStockinDetailFinishByStockinDetailId(String stockinDetailId) + { + return inStockinDetailFinishMapper.selectInStockinDetailFinishByStockinDetailId(stockinDetailId); + } + + /** + * 查询历史入库单据子信息列表 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 历史入库单据子信息 + */ + @Override + public List selectInStockinDetailFinishList(InStockinDetailFinish inStockinDetailFinish) + { + return inStockinDetailFinishMapper.selectInStockinDetailFinishList(inStockinDetailFinish); + } + + /** + * 新增历史入库单据子信息 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 结果 + */ + @Override + public int insertInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish) + { + return inStockinDetailFinishMapper.insertInStockinDetailFinish(inStockinDetailFinish); + } + + /** + * 修改历史入库单据子信息 + * + * @param inStockinDetailFinish 历史入库单据子信息 + * @return 结果 + */ + @Override + public int updateInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish) + { + return inStockinDetailFinishMapper.updateInStockinDetailFinish(inStockinDetailFinish); + } + + /** + * 批量删除历史入库单据子信息 + * + * @param stockinDetailIds 需要删除的历史入库单据子信息主键 + * @return 结果 + */ + @Override + public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds) + { + return inStockinDetailFinishMapper.deleteInStockinDetailFinishByStockinDetailIds(stockinDetailIds); + } + + /** + * 删除历史入库单据子信息信息 + * + * @param stockinDetailId 历史入库单据子信息主键 + * @return 结果 + */ + @Override + public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId) + { + return inStockinDetailFinishMapper.deleteInStockinDetailFinishByStockinDetailId(stockinDetailId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/controller/InStockinFinishController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/controller/InStockinFinishController.java new file mode 100644 index 0000000..63cd3a1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/controller/InStockinFinishController.java @@ -0,0 +1,104 @@ +package com.ruoyi.in.stockinfinish.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.in.stockinfinish.domain.InStockinFinish; +import com.ruoyi.in.stockinfinish.service.IInStockinFinishService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 历史入库单据主信息Controller + * + * @author ruoyi + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/in/stockinFinish") +public class InStockinFinishController extends BaseController +{ + @Autowired + private IInStockinFinishService inStockinFinishService; + + /** + * 查询历史入库单据主信息列表 + */ + @PreAuthorize("@ss.hasPermi('in:stockinFinish:list')") + @GetMapping("/list") + public TableDataInfo list(InStockinFinish inStockinFinish) + { + startPage(); + List list = inStockinFinishService.selectInStockinFinishList(inStockinFinish); + return getDataTable(list); + } + + /** + * 导出历史入库单据主信息列表 + */ + @PreAuthorize("@ss.hasPermi('in:stockinFinish:export')") + @Log(title = "历史入库单据主信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, InStockinFinish inStockinFinish) + { + List list = inStockinFinishService.selectInStockinFinishList(inStockinFinish); + ExcelUtil util = new ExcelUtil(InStockinFinish.class); + util.exportExcel(response, list, "历史入库单据主信息数据"); + } + + /** + * 获取历史入库单据主信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinFinish:query')") + @GetMapping(value = "/{stockinGuid}") + public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid) + { + return success(inStockinFinishService.selectInStockinFinishByStockinGuid(stockinGuid)); + } + + /** + * 新增历史入库单据主信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinFinish:add')") + @Log(title = "历史入库单据主信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody InStockinFinish inStockinFinish) + { + return toAjax(inStockinFinishService.insertInStockinFinish(inStockinFinish)); + } + + /** + * 修改历史入库单据主信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinFinish:edit')") + @Log(title = "历史入库单据主信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody InStockinFinish inStockinFinish) + { + return toAjax(inStockinFinishService.updateInStockinFinish(inStockinFinish)); + } + + /** + * 删除历史入库单据主信息 + */ + @PreAuthorize("@ss.hasPermi('in:stockinFinish:remove')") + @Log(title = "历史入库单据主信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{stockinGuids}") + public AjaxResult remove(@PathVariable String[] stockinGuids) + { + return toAjax(inStockinFinishService.deleteInStockinFinishByStockinGuids(stockinGuids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java new file mode 100644 index 0000000..a65c3ce --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java @@ -0,0 +1,307 @@ +package com.ruoyi.in.stockinfinish.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 历史入库单据主信息对象 in_stockin_finish + * + * @author ruoyi + * @date 2025-05-28 + */ +public class InStockinFinish extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** GUID */ + private String stockinGuid; + + /** 入库订单ID */ + @Excel(name = "入库订单ID") + private String stockinId; + + /** 入库类型 */ + @Excel(name = "入库类型") + private String inType; + + /** 建立时间 */ + @Excel(name = "建立时间") + private String createDate; + + /** 创建人 */ + @Excel(name = "创建人") + private String createManId; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseId; + + /** 完成日期 */ + @Excel(name = " 完成日期") + private String finishDate; + + /** erp单号 */ + @Excel(name = "erp单号") + private String erpBill; + + /** 单据来源 */ + @Excel(name = "单据来源") + private String stockSource; + + /** 部门编码 */ + @Excel(name = "部门编码") + private String departmentNo; + + /** 客户编码 */ + @Excel(name = "客户编码") + private String customerNo; + + /** 班组编码 */ + @Excel(name = "班组编码") + private String classNo; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String supplierNo; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String spare1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String spare2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String spare3; + + /** 备用字段4 */ + @Excel(name = "备用字段4") + private String spare4; + + /** 备用字段5 */ + @Excel(name = "备用字段5") + private String spare5; + + public void setStockinGuid(String stockinGuid) + { + this.stockinGuid = stockinGuid; + } + + public String getStockinGuid() + { + return stockinGuid; + } + + public void setStockinId(String stockinId) + { + this.stockinId = stockinId; + } + + public String getStockinId() + { + return stockinId; + } + + public void setInType(String inType) + { + this.inType = inType; + } + + public String getInType() + { + return inType; + } + + public void setCreateDate(String createDate) + { + this.createDate = createDate; + } + + public String getCreateDate() + { + return createDate; + } + + public void setCreateManId(String createManId) + { + this.createManId = createManId; + } + + public String getCreateManId() + { + return createManId; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setFinishDate(String finishDate) + { + this.finishDate = finishDate; + } + + public String getFinishDate() + { + return finishDate; + } + + public void setErpBill(String erpBill) + { + this.erpBill = erpBill; + } + + public String getErpBill() + { + return erpBill; + } + + public void setStockSource(String stockSource) + { + this.stockSource = stockSource; + } + + public String getStockSource() + { + return stockSource; + } + + public void setDepartmentNo(String departmentNo) + { + this.departmentNo = departmentNo; + } + + public String getDepartmentNo() + { + return departmentNo; + } + + public void setCustomerNo(String customerNo) + { + this.customerNo = customerNo; + } + + public String getCustomerNo() + { + return customerNo; + } + + public void setClassNo(String classNo) + { + this.classNo = classNo; + } + + public String getClassNo() + { + return classNo; + } + + public void setSupplierNo(String supplierNo) + { + this.supplierNo = supplierNo; + } + + public String getSupplierNo() + { + return supplierNo; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + public void setSpare5(String spare5) + { + this.spare5 = spare5; + } + + public String getSpare5() + { + return spare5; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockinGuid", getStockinGuid()) + .append("stockinId", getStockinId()) + .append("inType", getInType()) + .append("createDate", getCreateDate()) + .append("createManId", getCreateManId()) + .append("status", getStatus()) + .append("warehouseId", getWarehouseId()) + .append("finishDate", getFinishDate()) + .append("erpBill", getErpBill()) + .append("stockSource", getStockSource()) + .append("departmentNo", getDepartmentNo()) + .append("customerNo", getCustomerNo()) + .append("classNo", getClassNo()) + .append("supplierNo", getSupplierNo()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("spare5", getSpare5()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java new file mode 100644 index 0000000..a46ed5e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.in.stockinfinish.mapper; + +import java.util.List; +import com.ruoyi.in.stockinfinish.domain.InStockinFinish; + +/** + * 历史入库单据主信息Mapper接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface InStockinFinishMapper +{ + /** + * 查询历史入库单据主信息 + * + * @param stockinGuid 历史入库单据主信息主键 + * @return 历史入库单据主信息 + */ + public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid); + + /** + * 查询历史入库单据主信息列表 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 历史入库单据主信息集合 + */ + public List selectInStockinFinishList(InStockinFinish inStockinFinish); + + /** + * 新增历史入库单据主信息 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 结果 + */ + public int insertInStockinFinish(InStockinFinish inStockinFinish); + + /** + * 修改历史入库单据主信息 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 结果 + */ + public int updateInStockinFinish(InStockinFinish inStockinFinish); + + /** + * 删除历史入库单据主信息 + * + * @param stockinGuid 历史入库单据主信息主键 + * @return 结果 + */ + public int deleteInStockinFinishByStockinGuid(String stockinGuid); + + /** + * 批量删除历史入库单据主信息 + * + * @param stockinGuids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteInStockinFinishByStockinGuids(String[] stockinGuids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java new file mode 100644 index 0000000..bbe44f7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java @@ -0,0 +1,61 @@ +package com.ruoyi.in.stockinfinish.service; + +import java.util.List; +import com.ruoyi.in.stockinfinish.domain.InStockinFinish; + +/** + * 历史入库单据主信息Service接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface IInStockinFinishService +{ + /** + * 查询历史入库单据主信息 + * + * @param stockinGuid 历史入库单据主信息主键 + * @return 历史入库单据主信息 + */ + public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid); + + /** + * 查询历史入库单据主信息列表 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 历史入库单据主信息集合 + */ + public List selectInStockinFinishList(InStockinFinish inStockinFinish); + + /** + * 新增历史入库单据主信息 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 结果 + */ + public int insertInStockinFinish(InStockinFinish inStockinFinish); + + /** + * 修改历史入库单据主信息 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 结果 + */ + public int updateInStockinFinish(InStockinFinish inStockinFinish); + + /** + * 批量删除历史入库单据主信息 + * + * @param stockinGuids 需要删除的历史入库单据主信息主键集合 + * @return 结果 + */ + public int deleteInStockinFinishByStockinGuids(String[] stockinGuids); + + /** + * 删除历史入库单据主信息信息 + * + * @param stockinGuid 历史入库单据主信息主键 + * @return 结果 + */ + public int deleteInStockinFinishByStockinGuid(String stockinGuid); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java new file mode 100644 index 0000000..3b7b869 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.in.stockinfinish.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper; +import com.ruoyi.in.stockinfinish.domain.InStockinFinish; +import com.ruoyi.in.stockinfinish.service.IInStockinFinishService; + +/** + * 历史入库单据主信息Service业务层处理 + * + * @author ruoyi + * @date 2025-05-28 + */ +@Service +public class InStockinFinishServiceImpl implements IInStockinFinishService +{ + @Autowired + private InStockinFinishMapper inStockinFinishMapper; + + /** + * 查询历史入库单据主信息 + * + * @param stockinGuid 历史入库单据主信息主键 + * @return 历史入库单据主信息 + */ + @Override + public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid) + { + return inStockinFinishMapper.selectInStockinFinishByStockinGuid(stockinGuid); + } + + /** + * 查询历史入库单据主信息列表 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 历史入库单据主信息 + */ + @Override + public List selectInStockinFinishList(InStockinFinish inStockinFinish) + { + return inStockinFinishMapper.selectInStockinFinishList(inStockinFinish); + } + + /** + * 新增历史入库单据主信息 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 结果 + */ + @Override + public int insertInStockinFinish(InStockinFinish inStockinFinish) + { + return inStockinFinishMapper.insertInStockinFinish(inStockinFinish); + } + + /** + * 修改历史入库单据主信息 + * + * @param inStockinFinish 历史入库单据主信息 + * @return 结果 + */ + @Override + public int updateInStockinFinish(InStockinFinish inStockinFinish) + { + return inStockinFinishMapper.updateInStockinFinish(inStockinFinish); + } + + /** + * 批量删除历史入库单据主信息 + * + * @param stockinGuids 需要删除的历史入库单据主信息主键 + * @return 结果 + */ + @Override + public int deleteInStockinFinishByStockinGuids(String[] stockinGuids) + { + return inStockinFinishMapper.deleteInStockinFinishByStockinGuids(stockinGuids); + } + + /** + * 删除历史入库单据主信息信息 + * + * @param stockinGuid 历史入库单据主信息主键 + * @return 结果 + */ + @Override + public int deleteInStockinFinishByStockinGuid(String stockinGuid) + { + return inStockinFinishMapper.deleteInStockinFinishByStockinGuid(stockinGuid); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/controller/ReceiveStockinDetailFinishController.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/controller/ReceiveStockinDetailFinishController.java new file mode 100644 index 0000000..edce83e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/controller/ReceiveStockinDetailFinishController.java @@ -0,0 +1,104 @@ +package com.ruoyi.receive.stockindetailfinish.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish; +import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 历史接收单据子信息Controller + * + * @author ruoyi + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/receive/stockinDetailFinish") +public class ReceiveStockinDetailFinishController extends BaseController +{ + @Autowired + private IReceiveStockinDetailFinishService receiveStockinDetailFinishService; + + /** + * 查询历史接收单据子信息列表 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:list')") + @GetMapping("/list") + public TableDataInfo list(ReceiveStockinDetailFinish receiveStockinDetailFinish) + { + startPage(); + List list = receiveStockinDetailFinishService.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish); + return getDataTable(list); + } + + /** + * 导出历史接收单据子信息列表 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:export')") + @Log(title = "历史接收单据子信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ReceiveStockinDetailFinish receiveStockinDetailFinish) + { + List list = receiveStockinDetailFinishService.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish); + ExcelUtil util = new ExcelUtil(ReceiveStockinDetailFinish.class); + util.exportExcel(response, list, "历史接收单据子信息数据"); + } + + /** + * 获取历史接收单据子信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:query')") + @GetMapping(value = "/{stockinDetailId}") + public AjaxResult getInfo(@PathVariable("stockinDetailId") String stockinDetailId) + { + return success(receiveStockinDetailFinishService.selectReceiveStockinDetailFinishByStockinDetailId(stockinDetailId)); + } + + /** + * 新增历史接收单据子信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:add')") + @Log(title = "历史接收单据子信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ReceiveStockinDetailFinish receiveStockinDetailFinish) + { + return toAjax(receiveStockinDetailFinishService.insertReceiveStockinDetailFinish(receiveStockinDetailFinish)); + } + + /** + * 修改历史接收单据子信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:edit')") + @Log(title = "历史接收单据子信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ReceiveStockinDetailFinish receiveStockinDetailFinish) + { + return toAjax(receiveStockinDetailFinishService.updateReceiveStockinDetailFinish(receiveStockinDetailFinish)); + } + + /** + * 删除历史接收单据子信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:remove')") + @Log(title = "历史接收单据子信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{stockinDetailIds}") + public AjaxResult remove(@PathVariable String[] stockinDetailIds) + { + return toAjax(receiveStockinDetailFinishService.deleteReceiveStockinDetailFinishByStockinDetailIds(stockinDetailIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java new file mode 100644 index 0000000..700cfd2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java @@ -0,0 +1,413 @@ +package com.ruoyi.receive.stockindetailfinish.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 历史接收单据子信息对象 receive_stockin_detail_finish + * + * @author ruoyi + * @date 2025-05-28 + */ +public class ReceiveStockinDetailFinish extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 子单ID */ + private String stockinDetailId; + + /** 主单GUID */ + @Excel(name = "主单GUID") + private String stockinGuid; + + /** 主单ID */ + @Excel(name = "主单ID") + private String stockinId; + + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; + + /** 物料ID */ + @Excel(name = "物料ID") + private String productGuid; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String productId; + + /** 计划数量 */ + @Excel(name = "计划数量") + private String quantity; + + /** 计划数量(箱) */ + @Excel(name = "计划数量(箱)") + private String quantityX; + + /** 计划数量(件) */ + @Excel(name = "计划数量(件)") + private String quantityJ; + + /** 参考单价 */ + @Excel(name = "参考单价") + private String price; + + /** 品牌 */ + @Excel(name = "品牌") + private String cargoNo; + + /** 实际数量 */ + @Excel(name = "实际数量") + private String assignNum; + + /** 实际数量(箱) */ + @Excel(name = "实际数量(箱)") + private String assignNumX; + + /** 实际数量(件) */ + @Excel(name = "实际数量(件)") + private String assignNumJ; + + /** 入库日期 */ + @Excel(name = "入库日期") + private String printDate; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String stockStatus; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String supplierId; + + /** 客户编码 */ + @Excel(name = "客户编码") + private String customerId; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 规格 */ + @Excel(name = "规格") + private String spec; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String spare1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String spare2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String spare3; + + /** 备用字段4 */ + @Excel(name = "备用字段4") + private String spare4; + + /** 备用字段5 */ + @Excel(name = "备用字段5") + private String spare5; + + /** 备用字段6 */ + @Excel(name = "备用字段6") + private String spare6; + + public void setStockinDetailId(String stockinDetailId) + { + this.stockinDetailId = stockinDetailId; + } + + public String getStockinDetailId() + { + return stockinDetailId; + } + + public void setStockinGuid(String stockinGuid) + { + this.stockinGuid = stockinGuid; + } + + public String getStockinGuid() + { + return stockinGuid; + } + + public void setStockinId(String stockinId) + { + this.stockinId = stockinId; + } + + public String getStockinId() + { + return stockinId; + } + + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setProductGuid(String productGuid) + { + this.productGuid = productGuid; + } + + public String getProductGuid() + { + return productGuid; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setQuantity(String quantity) + { + this.quantity = quantity; + } + + public String getQuantity() + { + return quantity; + } + + public void setQuantityX(String quantityX) + { + this.quantityX = quantityX; + } + + public String getQuantityX() + { + return quantityX; + } + + public void setQuantityJ(String quantityJ) + { + this.quantityJ = quantityJ; + } + + public String getQuantityJ() + { + return quantityJ; + } + + public void setPrice(String price) + { + this.price = price; + } + + public String getPrice() + { + return price; + } + + public void setCargoNo(String cargoNo) + { + this.cargoNo = cargoNo; + } + + public String getCargoNo() + { + return cargoNo; + } + + public void setAssignNum(String assignNum) + { + this.assignNum = assignNum; + } + + public String getAssignNum() + { + return assignNum; + } + + public void setAssignNumX(String assignNumX) + { + this.assignNumX = assignNumX; + } + + public String getAssignNumX() + { + return assignNumX; + } + + public void setAssignNumJ(String assignNumJ) + { + this.assignNumJ = assignNumJ; + } + + public String getAssignNumJ() + { + return assignNumJ; + } + + public void setPrintDate(String printDate) + { + this.printDate = printDate; + } + + public String getPrintDate() + { + return printDate; + } + + public void setStockStatus(String stockStatus) + { + this.stockStatus = stockStatus; + } + + public String getStockStatus() + { + return stockStatus; + } + + public void setSupplierId(String supplierId) + { + this.supplierId = supplierId; + } + + public String getSupplierId() + { + return supplierId; + } + + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + + public void setSpec(String spec) + { + this.spec = spec; + } + + public String getSpec() + { + return spec; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + public void setSpare5(String spare5) + { + this.spare5 = spare5; + } + + public String getSpare5() + { + return spare5; + } + + public void setSpare6(String spare6) + { + this.spare6 = spare6; + } + + public String getSpare6() + { + return spare6; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockinDetailId", getStockinDetailId()) + .append("stockinGuid", getStockinGuid()) + .append("stockinId", getStockinId()) + .append("lotNo", getLotNo()) + .append("productGuid", getProductGuid()) + .append("productId", getProductId()) + .append("quantity", getQuantity()) + .append("quantityX", getQuantityX()) + .append("quantityJ", getQuantityJ()) + .append("price", getPrice()) + .append("cargoNo", getCargoNo()) + .append("remark", getRemark()) + .append("assignNum", getAssignNum()) + .append("assignNumX", getAssignNumX()) + .append("assignNumJ", getAssignNumJ()) + .append("printDate", getPrintDate()) + .append("stockStatus", getStockStatus()) + .append("supplierId", getSupplierId()) + .append("customerId", getCustomerId()) + .append("unit", getUnit()) + .append("spec", getSpec()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("spare5", getSpare5()) + .append("spare6", getSpare6()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java new file mode 100644 index 0000000..06d7e97 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.receive.stockindetailfinish.mapper; + +import java.util.List; +import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish; + +/** + * 历史接收单据子信息Mapper接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface ReceiveStockinDetailFinishMapper +{ + /** + * 查询历史接收单据子信息 + * + * @param stockinDetailId 历史接收单据子信息主键 + * @return 历史接收单据子信息 + */ + public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId); + + /** + * 查询历史接收单据子信息列表 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 历史接收单据子信息集合 + */ + public List selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish); + + /** + * 新增历史接收单据子信息 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 结果 + */ + public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish); + + /** + * 修改历史接收单据子信息 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 结果 + */ + public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish); + + /** + * 删除历史接收单据子信息 + * + * @param stockinDetailId 历史接收单据子信息主键 + * @return 结果 + */ + public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId); + + /** + * 批量删除历史接收单据子信息 + * + * @param stockinDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java new file mode 100644 index 0000000..519ba6a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java @@ -0,0 +1,61 @@ +package com.ruoyi.receive.stockindetailfinish.service; + +import java.util.List; +import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish; + +/** + * 历史接收单据子信息Service接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface IReceiveStockinDetailFinishService +{ + /** + * 查询历史接收单据子信息 + * + * @param stockinDetailId 历史接收单据子信息主键 + * @return 历史接收单据子信息 + */ + public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId); + + /** + * 查询历史接收单据子信息列表 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 历史接收单据子信息集合 + */ + public List selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish); + + /** + * 新增历史接收单据子信息 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 结果 + */ + public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish); + + /** + * 修改历史接收单据子信息 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 结果 + */ + public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish); + + /** + * 批量删除历史接收单据子信息 + * + * @param stockinDetailIds 需要删除的历史接收单据子信息主键集合 + * @return 结果 + */ + public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds); + + /** + * 删除历史接收单据子信息信息 + * + * @param stockinDetailId 历史接收单据子信息主键 + * @return 结果 + */ + public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java new file mode 100644 index 0000000..a67006c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.receive.stockindetailfinish.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper; +import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish; +import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService; + +/** + * 历史接收单据子信息Service业务层处理 + * + * @author ruoyi + * @date 2025-05-28 + */ +@Service +public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService +{ + @Autowired + private ReceiveStockinDetailFinishMapper receiveStockinDetailFinishMapper; + + /** + * 查询历史接收单据子信息 + * + * @param stockinDetailId 历史接收单据子信息主键 + * @return 历史接收单据子信息 + */ + @Override + public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId) + { + return receiveStockinDetailFinishMapper.selectReceiveStockinDetailFinishByStockinDetailId(stockinDetailId); + } + + /** + * 查询历史接收单据子信息列表 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 历史接收单据子信息 + */ + @Override + public List selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish) + { + return receiveStockinDetailFinishMapper.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish); + } + + /** + * 新增历史接收单据子信息 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 结果 + */ + @Override + public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish) + { + return receiveStockinDetailFinishMapper.insertReceiveStockinDetailFinish(receiveStockinDetailFinish); + } + + /** + * 修改历史接收单据子信息 + * + * @param receiveStockinDetailFinish 历史接收单据子信息 + * @return 结果 + */ + @Override + public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish) + { + return receiveStockinDetailFinishMapper.updateReceiveStockinDetailFinish(receiveStockinDetailFinish); + } + + /** + * 批量删除历史接收单据子信息 + * + * @param stockinDetailIds 需要删除的历史接收单据子信息主键 + * @return 结果 + */ + @Override + public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds) + { + return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailIds(stockinDetailIds); + } + + /** + * 删除历史接收单据子信息信息 + * + * @param stockinDetailId 历史接收单据子信息主键 + * @return 结果 + */ + @Override + public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId) + { + return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailId(stockinDetailId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/controller/ReceiveStockinFinishController.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/controller/ReceiveStockinFinishController.java new file mode 100644 index 0000000..98cbe64 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/controller/ReceiveStockinFinishController.java @@ -0,0 +1,104 @@ +package com.ruoyi.receive.stockinfinish.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish; +import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 历史接收单据主信息Controller + * + * @author ruoyi + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/receive/stockinFinish") +public class ReceiveStockinFinishController extends BaseController +{ + @Autowired + private IReceiveStockinFinishService receiveStockinFinishService; + + /** + * 查询历史接收单据主信息列表 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinFinish:list')") + @GetMapping("/list") + public TableDataInfo list(ReceiveStockinFinish receiveStockinFinish) + { + startPage(); + List list = receiveStockinFinishService.selectReceiveStockinFinishList(receiveStockinFinish); + return getDataTable(list); + } + + /** + * 导出历史接收单据主信息列表 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinFinish:export')") + @Log(title = "历史接收单据主信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ReceiveStockinFinish receiveStockinFinish) + { + List list = receiveStockinFinishService.selectReceiveStockinFinishList(receiveStockinFinish); + ExcelUtil util = new ExcelUtil(ReceiveStockinFinish.class); + util.exportExcel(response, list, "历史接收单据主信息数据"); + } + + /** + * 获取历史接收单据主信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinFinish:query')") + @GetMapping(value = "/{stockinGuid}") + public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid) + { + return success(receiveStockinFinishService.selectReceiveStockinFinishByStockinGuid(stockinGuid)); + } + + /** + * 新增历史接收单据主信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinFinish:add')") + @Log(title = "历史接收单据主信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ReceiveStockinFinish receiveStockinFinish) + { + return toAjax(receiveStockinFinishService.insertReceiveStockinFinish(receiveStockinFinish)); + } + + /** + * 修改历史接收单据主信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinFinish:edit')") + @Log(title = "历史接收单据主信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ReceiveStockinFinish receiveStockinFinish) + { + return toAjax(receiveStockinFinishService.updateReceiveStockinFinish(receiveStockinFinish)); + } + + /** + * 删除历史接收单据主信息 + */ + @PreAuthorize("@ss.hasPermi('receive:stockinFinish:remove')") + @Log(title = "历史接收单据主信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{stockinGuids}") + public AjaxResult remove(@PathVariable String[] stockinGuids) + { + return toAjax(receiveStockinFinishService.deleteReceiveStockinFinishByStockinGuids(stockinGuids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/domain/ReceiveStockinFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/domain/ReceiveStockinFinish.java new file mode 100644 index 0000000..9d26e82 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/domain/ReceiveStockinFinish.java @@ -0,0 +1,307 @@ +package com.ruoyi.receive.stockinfinish.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 历史接收单据主信息对象 receive_stockin_finish + * + * @author ruoyi + * @date 2025-05-28 + */ +public class ReceiveStockinFinish extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** GUID */ + private String stockinGuid; + + /** 入库订单ID */ + @Excel(name = "入库订单ID") + private String stockinId; + + /** 入库类型 */ + @Excel(name = "入库类型") + private String inType; + + /** 建立时间 */ + @Excel(name = "建立时间") + private String createDate; + + /** 创建人 */ + @Excel(name = "创建人") + private String createManId; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseId; + + /** 备用字段5 */ + @Excel(name = "备用字段5") + private String spare5; + + /** 备用字段4 */ + @Excel(name = "备用字段4") + private String spare4; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String spare3; + + /** 完成日期 */ + @Excel(name = " 完成日期") + private String finishDate; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String spare2; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String spare1; + + /** erp单号 */ + @Excel(name = "erp单号") + private String erpBill; + + /** 单据来源 */ + @Excel(name = "单据来源") + private String stockSource; + + /** 部门编码 */ + @Excel(name = "部门编码") + private String departmentNo; + + /** 客户编码 */ + @Excel(name = "客户编码") + private String customerNo; + + /** 班组编码 */ + @Excel(name = "班组编码") + private String classNo; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String supplierNo; + + public void setStockinGuid(String stockinGuid) + { + this.stockinGuid = stockinGuid; + } + + public String getStockinGuid() + { + return stockinGuid; + } + + public void setStockinId(String stockinId) + { + this.stockinId = stockinId; + } + + public String getStockinId() + { + return stockinId; + } + + public void setInType(String inType) + { + this.inType = inType; + } + + public String getInType() + { + return inType; + } + + public void setCreateDate(String createDate) + { + this.createDate = createDate; + } + + public String getCreateDate() + { + return createDate; + } + + public void setCreateManId(String createManId) + { + this.createManId = createManId; + } + + public String getCreateManId() + { + return createManId; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setSpare5(String spare5) + { + this.spare5 = spare5; + } + + public String getSpare5() + { + return spare5; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setFinishDate(String finishDate) + { + this.finishDate = finishDate; + } + + public String getFinishDate() + { + return finishDate; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setErpBill(String erpBill) + { + this.erpBill = erpBill; + } + + public String getErpBill() + { + return erpBill; + } + + public void setStockSource(String stockSource) + { + this.stockSource = stockSource; + } + + public String getStockSource() + { + return stockSource; + } + + public void setDepartmentNo(String departmentNo) + { + this.departmentNo = departmentNo; + } + + public String getDepartmentNo() + { + return departmentNo; + } + + public void setCustomerNo(String customerNo) + { + this.customerNo = customerNo; + } + + public String getCustomerNo() + { + return customerNo; + } + + public void setClassNo(String classNo) + { + this.classNo = classNo; + } + + public String getClassNo() + { + return classNo; + } + + public void setSupplierNo(String supplierNo) + { + this.supplierNo = supplierNo; + } + + public String getSupplierNo() + { + return supplierNo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockinGuid", getStockinGuid()) + .append("stockinId", getStockinId()) + .append("inType", getInType()) + .append("createDate", getCreateDate()) + .append("createManId", getCreateManId()) + .append("status", getStatus()) + .append("warehouseId", getWarehouseId()) + .append("spare5", getSpare5()) + .append("spare4", getSpare4()) + .append("spare3", getSpare3()) + .append("finishDate", getFinishDate()) + .append("spare2", getSpare2()) + .append("spare1", getSpare1()) + .append("erpBill", getErpBill()) + .append("stockSource", getStockSource()) + .append("departmentNo", getDepartmentNo()) + .append("customerNo", getCustomerNo()) + .append("classNo", getClassNo()) + .append("supplierNo", getSupplierNo()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java new file mode 100644 index 0000000..12b1733 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.receive.stockinfinish.mapper; + +import java.util.List; +import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish; + +/** + * 历史接收单据主信息Mapper接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface ReceiveStockinFinishMapper +{ + /** + * 查询历史接收单据主信息 + * + * @param stockinGuid 历史接收单据主信息主键 + * @return 历史接收单据主信息 + */ + public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid); + + /** + * 查询历史接收单据主信息列表 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 历史接收单据主信息集合 + */ + public List selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish); + + /** + * 新增历史接收单据主信息 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 结果 + */ + public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish); + + /** + * 修改历史接收单据主信息 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 结果 + */ + public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish); + + /** + * 删除历史接收单据主信息 + * + * @param stockinGuid 历史接收单据主信息主键 + * @return 结果 + */ + public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid); + + /** + * 批量删除历史接收单据主信息 + * + * @param stockinGuids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java new file mode 100644 index 0000000..62ab345 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java @@ -0,0 +1,61 @@ +package com.ruoyi.receive.stockinfinish.service; + +import java.util.List; +import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish; + +/** + * 历史接收单据主信息Service接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface IReceiveStockinFinishService +{ + /** + * 查询历史接收单据主信息 + * + * @param stockinGuid 历史接收单据主信息主键 + * @return 历史接收单据主信息 + */ + public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid); + + /** + * 查询历史接收单据主信息列表 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 历史接收单据主信息集合 + */ + public List selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish); + + /** + * 新增历史接收单据主信息 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 结果 + */ + public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish); + + /** + * 修改历史接收单据主信息 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 结果 + */ + public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish); + + /** + * 批量删除历史接收单据主信息 + * + * @param stockinGuids 需要删除的历史接收单据主信息主键集合 + * @return 结果 + */ + public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids); + + /** + * 删除历史接收单据主信息信息 + * + * @param stockinGuid 历史接收单据主信息主键 + * @return 结果 + */ + public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java new file mode 100644 index 0000000..b5a5e7c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.receive.stockinfinish.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper; +import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish; +import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService; + +/** + * 历史接收单据主信息Service业务层处理 + * + * @author ruoyi + * @date 2025-05-28 + */ +@Service +public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService +{ + @Autowired + private ReceiveStockinFinishMapper receiveStockinFinishMapper; + + /** + * 查询历史接收单据主信息 + * + * @param stockinGuid 历史接收单据主信息主键 + * @return 历史接收单据主信息 + */ + @Override + public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid) + { + return receiveStockinFinishMapper.selectReceiveStockinFinishByStockinGuid(stockinGuid); + } + + /** + * 查询历史接收单据主信息列表 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 历史接收单据主信息 + */ + @Override + public List selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish) + { + return receiveStockinFinishMapper.selectReceiveStockinFinishList(receiveStockinFinish); + } + + /** + * 新增历史接收单据主信息 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 结果 + */ + @Override + public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish) + { + return receiveStockinFinishMapper.insertReceiveStockinFinish(receiveStockinFinish); + } + + /** + * 修改历史接收单据主信息 + * + * @param receiveStockinFinish 历史接收单据主信息 + * @return 结果 + */ + @Override + public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish) + { + return receiveStockinFinishMapper.updateReceiveStockinFinish(receiveStockinFinish); + } + + /** + * 批量删除历史接收单据主信息 + * + * @param stockinGuids 需要删除的历史接收单据主信息主键 + * @return 结果 + */ + @Override + public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids) + { + return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuids(stockinGuids); + } + + /** + * 删除历史接收单据主信息信息 + * + * @param stockinGuid 历史接收单据主信息主键 + * @return 结果 + */ + @Override + public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid) + { + return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuid(stockinGuid); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/controller/BasStockFreezeRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/controller/BasStockFreezeRecordController.java new file mode 100644 index 0000000..3f3aaa7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/controller/BasStockFreezeRecordController.java @@ -0,0 +1,104 @@ +package com.ruoyi.stock.freeze.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; +import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 库存冻结记录Controller + * + * @author ruoyi + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/stock/freeze") +public class BasStockFreezeRecordController extends BaseController +{ + @Autowired + private IBasStockFreezeRecordService basStockFreezeRecordService; + + /** + * 查询库存冻结记录列表 + */ + @PreAuthorize("@ss.hasPermi('stock:freeze:list')") + @GetMapping("/list") + public TableDataInfo list(BasStockFreezeRecord basStockFreezeRecord) + { + startPage(); + List list = basStockFreezeRecordService.selectBasStockFreezeRecordList(basStockFreezeRecord); + return getDataTable(list); + } + + /** + * 导出库存冻结记录列表 + */ + @PreAuthorize("@ss.hasPermi('stock:freeze:export')") + @Log(title = "库存冻结记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasStockFreezeRecord basStockFreezeRecord) + { + List list = basStockFreezeRecordService.selectBasStockFreezeRecordList(basStockFreezeRecord); + ExcelUtil util = new ExcelUtil(BasStockFreezeRecord.class); + util.exportExcel(response, list, "库存冻结记录数据"); + } + + /** + * 获取库存冻结记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('stock:freeze:query')") + @GetMapping(value = "/{whGuid}") + public AjaxResult getInfo(@PathVariable("whGuid") String whGuid) + { + return success(basStockFreezeRecordService.selectBasStockFreezeRecordByWhGuid(whGuid)); + } + + /** + * 新增库存冻结记录 + */ + @PreAuthorize("@ss.hasPermi('stock:freeze:add')") + @Log(title = "库存冻结记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasStockFreezeRecord basStockFreezeRecord) + { + return toAjax(basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord)); + } + + /** + * 修改库存冻结记录 + */ + @PreAuthorize("@ss.hasPermi('stock:freeze:edit')") + @Log(title = "库存冻结记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasStockFreezeRecord basStockFreezeRecord) + { + return toAjax(basStockFreezeRecordService.updateBasStockFreezeRecord(basStockFreezeRecord)); + } + + /** + * 删除库存冻结记录 + */ + @PreAuthorize("@ss.hasPermi('stock:freeze:remove')") + @Log(title = "库存冻结记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{whGuids}") + public AjaxResult remove(@PathVariable String[] whGuids) + { + return toAjax(basStockFreezeRecordService.deleteBasStockFreezeRecordByWhGuids(whGuids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java new file mode 100644 index 0000000..8ab497f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java @@ -0,0 +1,278 @@ +package com.ruoyi.stock.freeze.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 库存冻结记录对象 bas_stock_freeze_record + * + * @author ruoyi + * @date 2025-05-28 + */ +public class BasStockFreezeRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** guid */ + private String whGuid; + + /** 库存编码 */ + @Excel(name = "库存编码") + private String stockId; + + /** 货位编码 */ + @Excel(name = "货位编码") + private String cargoSpaceId; + + /** 托盘条码 */ + @Excel(name = "托盘条码") + private String trayCode; + + /** 物品编码 */ + @Excel(name = "物品编码") + private String productId; + + /** 物品名称 */ + @Excel(name = "物品名称") + private String productName; + + /** 生产日期 */ + @Excel(name = "生产日期") + private String printDate; + + /** 批号 */ + @Excel(name = "批号") + private String lotNo; + + /** 初始状态 */ + @Excel(name = "初始状态") + private String oldStatus; + + /** 更改状态 */ + @Excel(name = "更改状态") + private String currStatus; + + /** 操作 */ + @Excel(name = "操作") + private String method; + + /** 仓库 */ + @Excel(name = "仓库") + private String warehouseId; + + /** 库存字表id */ + @Excel(name = "库存字表id") + private String stockDetailId; + + /** 操作目标 */ + @Excel(name = "操作目标") + private String operatingTarget; + + /** 条码数量（旧） */ + @Excel(name = "条码数量", readConverterExp = "旧=") + private String barCodeOldQuantity; + + /** 条码数量（新） */ + @Excel(name = "条码数量", readConverterExp = "新=") + private String barCodeQuantity; + + /** 物料guid */ + @Excel(name = "物料guid") + private String productGuid; + + public void setWhGuid(String whGuid) + { + this.whGuid = whGuid; + } + + public String getWhGuid() + { + return whGuid; + } + + public void setStockId(String stockId) + { + this.stockId = stockId; + } + + public String getStockId() + { + return stockId; + } + + public void setCargoSpaceId(String cargoSpaceId) + { + this.cargoSpaceId = cargoSpaceId; + } + + public String getCargoSpaceId() + { + return cargoSpaceId; + } + + public void setTrayCode(String trayCode) + { + this.trayCode = trayCode; + } + + public String getTrayCode() + { + return trayCode; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setProductName(String productName) + { + this.productName = productName; + } + + public String getProductName() + { + return productName; + } + + public void setPrintDate(String printDate) + { + this.printDate = printDate; + } + + public String getPrintDate() + { + return printDate; + } + + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setOldStatus(String oldStatus) + { + this.oldStatus = oldStatus; + } + + public String getOldStatus() + { + return oldStatus; + } + + public void setCurrStatus(String currStatus) + { + this.currStatus = currStatus; + } + + public String getCurrStatus() + { + return currStatus; + } + + public void setMethod(String method) + { + this.method = method; + } + + public String getMethod() + { + return method; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setStockDetailId(String stockDetailId) + { + this.stockDetailId = stockDetailId; + } + + public String getStockDetailId() + { + return stockDetailId; + } + + public void setOperatingTarget(String operatingTarget) + { + this.operatingTarget = operatingTarget; + } + + public String getOperatingTarget() + { + return operatingTarget; + } + + public void setBarCodeOldQuantity(String barCodeOldQuantity) + { + this.barCodeOldQuantity = barCodeOldQuantity; + } + + public String getBarCodeOldQuantity() + { + return barCodeOldQuantity; + } + + public void setBarCodeQuantity(String barCodeQuantity) + { + this.barCodeQuantity = barCodeQuantity; + } + + public String getBarCodeQuantity() + { + return barCodeQuantity; + } + + public void setProductGuid(String productGuid) + { + this.productGuid = productGuid; + } + + public String getProductGuid() + { + return productGuid; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("whGuid", getWhGuid()) + .append("stockId", getStockId()) + .append("cargoSpaceId", getCargoSpaceId()) + .append("trayCode", getTrayCode()) + .append("productId", getProductId()) + .append("productName", getProductName()) + .append("printDate", getPrintDate()) + .append("lotNo", getLotNo()) + .append("oldStatus", getOldStatus()) + .append("currStatus", getCurrStatus()) + .append("method", getMethod()) + .append("warehouseId", getWarehouseId()) + .append("createTime", getCreateTime()) + .append("stockDetailId", getStockDetailId()) + .append("operatingTarget", getOperatingTarget()) + .append("barCodeOldQuantity", getBarCodeOldQuantity()) + .append("barCodeQuantity", getBarCodeQuantity()) + .append("productGuid", getProductGuid()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/mapper/BasStockFreezeRecordMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/mapper/BasStockFreezeRecordMapper.java new file mode 100644 index 0000000..6f70d62 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/mapper/BasStockFreezeRecordMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.stock.freeze.mapper; + +import java.util.List; +import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; + +/** + * 库存冻结记录Mapper接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface BasStockFreezeRecordMapper +{ + /** + * 查询库存冻结记录 + * + * @param whGuid 库存冻结记录主键 + * @return 库存冻结记录 + */ + public BasStockFreezeRecord selectBasStockFreezeRecordByWhGuid(String whGuid); + + /** + * 查询库存冻结记录列表 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 库存冻结记录集合 + */ + public List selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord); + + /** + * 新增库存冻结记录 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 结果 + */ + public int insertBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord); + + /** + * 修改库存冻结记录 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 结果 + */ + public int updateBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord); + + /** + * 删除库存冻结记录 + * + * @param whGuid 库存冻结记录主键 + * @return 结果 + */ + public int deleteBasStockFreezeRecordByWhGuid(String whGuid); + + /** + * 批量删除库存冻结记录 + * + * @param whGuids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBasStockFreezeRecordByWhGuids(String[] whGuids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/IBasStockFreezeRecordService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/IBasStockFreezeRecordService.java new file mode 100644 index 0000000..65d4266 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/IBasStockFreezeRecordService.java @@ -0,0 +1,61 @@ +package com.ruoyi.stock.freeze.service; + +import java.util.List; +import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; + +/** + * 库存冻结记录Service接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface IBasStockFreezeRecordService +{ + /** + * 查询库存冻结记录 + * + * @param whGuid 库存冻结记录主键 + * @return 库存冻结记录 + */ + public BasStockFreezeRecord selectBasStockFreezeRecordByWhGuid(String whGuid); + + /** + * 查询库存冻结记录列表 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 库存冻结记录集合 + */ + public List selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord); + + /** + * 新增库存冻结记录 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 结果 + */ + public int insertBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord); + + /** + * 修改库存冻结记录 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 结果 + */ + public int updateBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord); + + /** + * 批量删除库存冻结记录 + * + * @param whGuids 需要删除的库存冻结记录主键集合 + * @return 结果 + */ + public int deleteBasStockFreezeRecordByWhGuids(String[] whGuids); + + /** + * 删除库存冻结记录信息 + * + * @param whGuid 库存冻结记录主键 + * @return 结果 + */ + public int deleteBasStockFreezeRecordByWhGuid(String whGuid); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java new file mode 100644 index 0000000..b4213fe --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java @@ -0,0 +1,98 @@ +package com.ruoyi.stock.freeze.service.impl; + +import java.util.List; + +import cn.hutool.core.util.IdUtil; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper; +import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; +import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; + +/** + * 库存冻结记录Service业务层处理 + * + * @author ruoyi + * @date 2025-05-28 + */ +@Service +public class BasStockFreezeRecordServiceImpl implements IBasStockFreezeRecordService +{ + @Autowired + private BasStockFreezeRecordMapper basStockFreezeRecordMapper; + + /** + * 查询库存冻结记录 + * + * @param whGuid 库存冻结记录主键 + * @return 库存冻结记录 + */ + @Override + public BasStockFreezeRecord selectBasStockFreezeRecordByWhGuid(String whGuid) + { + return basStockFreezeRecordMapper.selectBasStockFreezeRecordByWhGuid(whGuid); + } + + /** + * 查询库存冻结记录列表 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 库存冻结记录 + */ + @Override + public List selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord) + { + return basStockFreezeRecordMapper.selectBasStockFreezeRecordList(basStockFreezeRecord); + } + + /** + * 新增库存冻结记录 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 结果 + */ + @Override + public int insertBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord) + { + basStockFreezeRecord.setCreateTime(DateUtils.getNowDate()); + basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID()); + return basStockFreezeRecordMapper.insertBasStockFreezeRecord(basStockFreezeRecord); + } + + /** + * 修改库存冻结记录 + * + * @param basStockFreezeRecord 库存冻结记录 + * @return 结果 + */ + @Override + public int updateBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord) + { + return basStockFreezeRecordMapper.updateBasStockFreezeRecord(basStockFreezeRecord); + } + + /** + * 批量删除库存冻结记录 + * + * @param whGuids 需要删除的库存冻结记录主键 + * @return 结果 + */ + @Override + public int deleteBasStockFreezeRecordByWhGuids(String[] whGuids) + { + return basStockFreezeRecordMapper.deleteBasStockFreezeRecordByWhGuids(whGuids); + } + + /** + * 删除库存冻结记录信息 + * + * @param whGuid 库存冻结记录主键 + * @return 结果 + */ + @Override + public int deleteBasStockFreezeRecordByWhGuid(String whGuid) + { + return basStockFreezeRecordMapper.deleteBasStockFreezeRecordByWhGuid(whGuid); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index a533da8..7fb60ce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -6,6 +6,8 @@ import java.util.List; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; +import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; import com.ruoyi.stock.maintain.domain.BasStockMaintainRecord; import com.ruoyi.stock.maintain.service.IBasStockMaintainRecordService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +30,8 @@ public class BasStockServiceImpl implements IBasStockService private BasStockMapper basStockMapper; @Autowired private IBasStockMaintainRecordService basStockMaintainRecordService; + @Autowired + private IBasStockFreezeRecordService basStockFreezeRecordService; /** * 查询库存信息 @@ -94,9 +98,29 @@ public class BasStockServiceImpl implements IBasStockService { BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId()); insertMaintainRecord(oldBasStock,basStock,"2"); + insertFreezeRecord(oldBasStock,basStock); return basStockMapper.updateBasStock(basStock); } + private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) { + if (!oldBasStock.getStockStatus().equals(basStock.getStockStatus())){ + BasStockFreezeRecord basStockFreezeRecord = new BasStockFreezeRecord(); + basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID()); + basStockFreezeRecord.setStockId(basStock.getStockId()); + basStockFreezeRecord.setCargoSpaceId(basStock.getCargoSpaceId()); + basStockFreezeRecord.setLotNo(basStock.getLotNo()); + basStockFreezeRecord.setTrayCode(basStock.getTrayCode()); + basStockFreezeRecord.setProductGuid(basStock.getProductGuid()); + basStockFreezeRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); + basStockFreezeRecord.setCreateTime(new Date()); + basStockFreezeRecord.setOldStatus(oldBasStock.getStockStatus()); + basStockFreezeRecord.setCurrStatus(basStock.getStockStatus()); + basStockFreezeRecord.setWarehouseId(basStock.getWarehouseId()); + basStockFreezeRecord.setMethod("0"); + basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord); + } + } + /** * 批量删除库存信息 * diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml new file mode 100644 index 0000000..ddd66c6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from in_stockin_detail_finish + + + + + + + + insert into in_stockin_detail_finish + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + scan_num, + scan_num_x, + scan_num_j, + + + #{stockinDetailId}, + #{stockinGuid}, + #{stockinId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{scanNum}, + #{scanNumX}, + #{scanNumJ}, + + + + + update in_stockin_detail_finish + + stockin_guid = #{stockinGuid}, + stockin_id = #{stockinId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + scan_num = #{scanNum}, + scan_num_x = #{scanNumX}, + scan_num_j = #{scanNumJ}, + + where stockin_detail_id = #{stockinDetailId} + + + + delete from in_stockin_detail_finish where stockin_detail_id = #{stockinDetailId} + + + + delete from in_stockin_detail_finish where stockin_detail_id in + + #{stockinDetailId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml new file mode 100644 index 0000000..77a9ec3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from in_stockin_finish + + + + + + + + insert into in_stockin_finish + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + finish_date, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + spare1, + spare2, + spare3, + spare4, + spare5, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{finishDate}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + + + + + update in_stockin_finish + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + finish_date = #{finishDate}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + + where stockin_guid = #{stockinGuid} + + + + delete from in_stockin_finish where stockin_guid = #{stockinGuid} + + + + delete from in_stockin_finish where stockin_guid in + + #{stockinGuid} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml new file mode 100644 index 0000000..aa16daa --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail_finish + + + + + + + + insert into receive_stockin_detail_finish + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + + + #{stockinDetailId}, + #{stockinGuid}, + #{stockinId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + + + + + update receive_stockin_detail_finish + + stockin_guid = #{stockinGuid}, + stockin_id = #{stockinId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + + where stockin_detail_id = #{stockinDetailId} + + + + delete from receive_stockin_detail_finish where stockin_detail_id = #{stockinDetailId} + + + + delete from receive_stockin_detail_finish where stockin_detail_id in + + #{stockinDetailId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml new file mode 100644 index 0000000..2fc97d4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from receive_stockin_finish + + + + + + + + insert into receive_stockin_finish + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + spare5, + spare4, + spare3, + finish_date, + spare2, + spare1, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{spare5}, + #{spare4}, + #{spare3}, + #{finishDate}, + #{spare2}, + #{spare1}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + + + + + update receive_stockin_finish + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + spare5 = #{spare5}, + spare4 = #{spare4}, + spare3 = #{spare3}, + finish_date = #{finishDate}, + spare2 = #{spare2}, + spare1 = #{spare1}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + + where stockin_guid = #{stockinGuid} + + + + delete from receive_stockin_finish where stockin_guid = #{stockinGuid} + + + + delete from receive_stockin_finish where stockin_guid in + + #{stockinGuid} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml new file mode 100644 index 0000000..21c7c54 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select wh_guid, stock_id, cargo_space_id, tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid from bas_stock_freeze_record + + + + + + + + insert into bas_stock_freeze_record + + wh_guid, + stock_id, + cargo_space_id, + tray_code, + product_id, + product_name, + print_date, + lot_no, + old_status, + curr_status, + method, + warehouse_id, + create_time, + stock_detail_id, + operating_target, + bar_code_old_quantity, + bar_code_quantity, + product_guid, + + + #{whGuid}, + #{stockId}, + #{cargoSpaceId}, + #{trayCode}, + #{productId}, + #{productName}, + #{printDate}, + #{lotNo}, + #{oldStatus}, + #{currStatus}, + #{method}, + #{warehouseId}, + #{createTime}, + #{stockDetailId}, + #{operatingTarget}, + #{barCodeOldQuantity}, + #{barCodeQuantity}, + #{productGuid}, + + + + + update bas_stock_freeze_record + + stock_id = #{stockId}, + cargo_space_id = #{cargoSpaceId}, + tray_code = #{trayCode}, + product_id = #{productId}, + product_name = #{productName}, + print_date = #{printDate}, + lot_no = #{lotNo}, + old_status = #{oldStatus}, + curr_status = #{currStatus}, + method = #{method}, + warehouse_id = #{warehouseId}, + create_time = #{createTime}, + stock_detail_id = #{stockDetailId}, + operating_target = #{operatingTarget}, + bar_code_old_quantity = #{barCodeOldQuantity}, + bar_code_quantity = #{barCodeQuantity}, + product_guid = #{productGuid}, + + where wh_guid = #{whGuid} + + + + delete from bas_stock_freeze_record where wh_guid = #{whGuid} + + + + delete from bas_stock_freeze_record where wh_guid in + + #{whGuid} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/stock/freeze.js b/ruoyi-ui/src/api/stock/freeze.js new file mode 100644 index 0000000..38f512b --- /dev/null +++ b/ruoyi-ui/src/api/stock/freeze.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询库存冻结记录列表 +export function listFreeze(query) { + return request({ + url: '/stock/freeze/list', + method: 'get', + params: query + }) +} + +// 查询库存冻结记录详细 +export function getFreeze(whGuid) { + return request({ + url: '/stock/freeze/' + whGuid, + method: 'get' + }) +} + +// 新增库存冻结记录 +export function addFreeze(data) { + return request({ + url: '/stock/freeze', + method: 'post', + data: data + }) +} + +// 修改库存冻结记录 +export function updateFreeze(data) { + return request({ + url: '/stock/freeze', + method: 'put', + data: data + }) +} + +// 删除库存冻结记录 +export function delFreeze(whGuid) { + return request({ + url: '/stock/freeze/' + whGuid, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue index 50b961f..0b1ef3d 100644 --- a/ruoyi-ui/src/views/in/receive/index.vue +++ b/ruoyi-ui/src/views/in/receive/index.vue @@ -558,7 +558,21 @@ export default { this.getDetailList(data.stockinId) this.$modal.msgSuccess("质检成功"); }); - } + },/** + * 创建入库单 + * @param row + */ + handleCreateInStockIn(row) { + this.reset() + const stockinGuid = row.stockinGuid || this.ids + let data = { + stockinGuidList: stockinGuid + } + //console.log(data) + createStockin(data).then(response => { + this.getList() + }) + }, } } diff --git a/ruoyi-ui/src/views/stock/freeze/index.vue b/ruoyi-ui/src/views/stock/freeze/index.vue new file mode 100644 index 0000000..3bd7c75 --- /dev/null +++ b/ruoyi-ui/src/views/stock/freeze/index.vue @@ -0,0 +1,434 @@ + + +