diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/WarehousingOutHeadController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/WarehousingOutHeadController.java deleted file mode 100644 index fffa9b55..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/controller/WarehousingOutHeadController.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.ruoyi.stock.controller; - -import com.alibaba.druid.util.StringUtils; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.ck.utils.Result; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.stock.domain.WarehousingOutHead; -import com.ruoyi.stock.domain.WarehousingOutHeadWithList; -import com.ruoyi.stock.domain.WarehousingOutList; -import com.ruoyi.stock.service.IWarehousingOutHeadService; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 出库Controller - * - * @author ruoyi - * @date 2021-12-16 - */ -@Controller -@RequestMapping("/stock/warehousingOutHead") -public class WarehousingOutHeadController extends BaseController { - private String prefix = "stock/warehousingOutHead"; - - @Autowired - private IWarehousingOutHeadService warehousingOutHeadService; - - - @RequiresPermissions("stock:warehousingOutHead:view") - @GetMapping() - public String warehousingOutHead() { - return prefix + "/warehousingOutHead"; - } - - @GetMapping("/CP") - public String toCPOutHtml() { - return prefix + "/YLOut"; - } - - @GetMapping("/scrap") - public String toScrapOutHtml() { - return prefix + "/scrap"; - } - - /** - * 查询出库列表 - */ - @RequiresPermissions("stock:warehousingOutHead:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(WarehousingOutHead warehousingOutHead) { - startPage(); - List list = warehousingOutHeadService.selectWarehousingOutHeadList(warehousingOutHead); - return getDataTable(list); - } - - /** - * 导出出库列表 - */ - @RequiresPermissions("stock:warehousingOutHead:export") - @Log(title = "出库", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(WarehousingOutHead warehousingOutHead) { - List list = warehousingOutHeadService.selectWarehousingOutHeadList(warehousingOutHead); - ExcelUtil util = new ExcelUtil(WarehousingOutHead.class); - return util.exportExcel(list, "出库数据"); - } - - /** - * 新增出库 - */ - @GetMapping("/add") - public String add() { - return prefix + "/add"; - } - - /** - * 新增保存出库 - */ - @RequiresPermissions("stock:warehousingOutHead:add") - @Log(title = "出库", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(WarehousingOutHead warehousingOutHead) { - return toAjax(warehousingOutHeadService.insertWarehousingOutHead(warehousingOutHead)); - } - - /** - * 修改出库 - */ - @GetMapping("/edit/{warehousingOutNo}") - public String edit(@PathVariable("warehousingOutNo") String warehousingOutNo, ModelMap mmap) { - WarehousingOutHead warehousingOutHead = warehousingOutHeadService.selectWarehousingOutHeadById(warehousingOutNo); - mmap.put("warehousingOutHead", warehousingOutHead); - return prefix + "/edit"; - } - - /** - * 修改保存出库 - */ - @RequiresPermissions("stock:warehousingOutHead:edit") - @Log(title = "出库", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(WarehousingOutHead warehousingOutHead) { - return toAjax(warehousingOutHeadService.updateWarehousingOutHead(warehousingOutHead)); - } - - /** - * 删除出库 - */ - @RequiresPermissions("stock:warehousingOutHead:remove") - @Log(title = "出库", businessType = BusinessType.DELETE) - @PostMapping("/remove") - @ResponseBody - public AjaxResult remove(String ids) { - return toAjax(warehousingOutHeadService.deleteWarehousingOutHeadByIds(ids)); - } - - //获取出库记录(连表查询) - @ResponseBody - @PostMapping("/record") - public TableDataInfo getWarehousingOutRecord(WarehousingOutHeadWithList warehousingOutHeadWithList) { - startPage(); - List list = warehousingOutHeadService.selectWarehousingOutHeadWithList(warehousingOutHeadWithList); - return getDataTable(list); - } - - //获取出库单号 - @ResponseBody - @PostMapping("/no") - public Result getWarehousingOutNo() throws Exception { - String warehousingOutNo = warehousingOutHeadService.getWarehousingOutNo(); - return Result.getSuccessResult(warehousingOutNo); - } - - //根据制工单领取物料 - @ResponseBody - @PostMapping("/workOrder") - public Result addByWorkOrder(String jsonStr) throws Exception { - JSONObject jsonObject = JSONObject.parseObject(jsonStr); - WarehousingOutHead warehousingOutHead = jsonObject.toJavaObject(WarehousingOutHead.class); - if (StringUtils.isEmpty(warehousingOutHead.getWorkOrderNo())) { - return Result.getFailResult("请选择制工单号!", null); - } - List list = warehousingOutHead.getWarehousingOutLists(); - for (WarehousingOutList each : list) { - if (each.getRealQty() <= 0) { - return Result.getFailResult("请输入数量!", null); - } - } - int i = warehousingOutHeadService.insertByWorkOrder(warehousingOutHead); - return Result.getSuccessResult(i); - } - - @ResponseBody - @PostMapping("/scrapItem") - public Result addByScrapItem(String jsonStr) throws Exception { - JSONObject jsonObject = JSONObject.parseObject(jsonStr); - WarehousingOutHead warehousingOutHead = jsonObject.toJavaObject(WarehousingOutHead.class); - List list = warehousingOutHead.getWarehousingOutLists(); - for (WarehousingOutList each : list) { - if (each.getRealQty() <= 0) { - return Result.getFailResult("请输入数量!", null); - } - } - int i = warehousingOutHeadService.insertByScrapItem(warehousingOutHead); - return Result.getSuccessResult(i); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/WarehousingOutHead.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/WarehousingOutHead.java deleted file mode 100644 index dc56c09b..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/WarehousingOutHead.java +++ /dev/null @@ -1,319 +0,0 @@ -package com.ruoyi.stock.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import java.util.Date; -import java.util.List; - -/** - * 出库对象 warehousing_out_head - * - * @author ruoyi - * @date 2021-12-16 - */ -public class WarehousingOutHead extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 出库单号 */ - @Excel(name = "出库单号") - private String warehousingOutNo; - - /** 制工单号 */ - @Excel(name = "制工单号") - private String workOrderNo; - - /** 出库日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date warehousingOutDate; - - /** 联系人 */ - @Excel(name = "联系人") - private String linkman; - - /** 仓库号 */ - @Excel(name = "仓库号") - private String stockNo; - - /** 仓库名称 */ - @Excel(name = "仓库名称") - private String stockName; - - /** 仓库管理员 */ - @Excel(name = "仓库管理员") - private String warehouseKeeper; - - /** 出货类别 */ - @Excel(name = "出库类型") - private String outputClass; - - /** 物料类别 */ - @Excel(name = "物料类别") - private String itemClass; - - /** 是否确认 */ - @Excel(name = "是否确认") - private Long confirmFlag; - - /** 确认人 */ - @Excel(name = "确认人") - private String confirmMan; - - /** 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date confirmDate; - - /** 部门名称 */ - @Excel(name = "部门名称") - private String deptName; - - /** 领料单号 */ - @Excel(name = "领料单号") - private String spare1; - - /** 领料人 */ - @Excel(name = "领料人") - private String spare2; - - /** 备注 */ - @Excel(name = "备注") - private String spare3; - - /** */ - @Excel(name = "") - private String spare4; - - /** */ - @Excel(name = "") - private String spare5; - - /** */ - @Excel(name = "") - private String spare6; - - /** 部门编号 */ - @Excel(name = "部门编号") - private String deptNo; - - private List warehousingOutLists; - - public List getWarehousingOutLists() { - return warehousingOutLists; - } - - public void setWarehousingOutLists(List warehousingOutLists) { - this.warehousingOutLists = warehousingOutLists; - } - - public void setWarehousingOutNo(String warehousingOutNo) - { - this.warehousingOutNo = warehousingOutNo; - } - - public String getWarehousingOutNo() - { - return warehousingOutNo; - } - public void setWorkOrderNo(String workOrderNo) - { - this.workOrderNo = workOrderNo; - } - - public String getWorkOrderNo() - { - return workOrderNo; - } - public void setWarehousingOutDate(Date warehousingOutDate) - { - this.warehousingOutDate = warehousingOutDate; - } - - public Date getWarehousingOutDate() - { - return warehousingOutDate; - } - public void setLinkman(String linkman) - { - this.linkman = linkman; - } - - public String getLinkman() - { - return linkman; - } - public void setStockNo(String stockNo) - { - this.stockNo = stockNo; - } - - public String getStockNo() - { - return stockNo; - } - public void setStockName(String stockName) - { - this.stockName = stockName; - } - - public String getStockName() - { - return stockName; - } - public void setWarehouseKeeper(String warehouseKeeper) - { - this.warehouseKeeper = warehouseKeeper; - } - - public String getWarehouseKeeper() - { - return warehouseKeeper; - } - public void setOutputClass(String outputClass) - { - this.outputClass = outputClass; - } - - public String getOutputClass() - { - return outputClass; - } - public void setItemClass(String itemClass) - { - this.itemClass = itemClass; - } - - public String getItemClass() - { - return itemClass; - } - public void setConfirmFlag(Long confirmFlag) - { - this.confirmFlag = confirmFlag; - } - - public Long getConfirmFlag() - { - return confirmFlag; - } - public void setConfirmMan(String confirmMan) - { - this.confirmMan = confirmMan; - } - - public String getConfirmMan() - { - return confirmMan; - } - public void setConfirmDate(Date confirmDate) - { - this.confirmDate = confirmDate; - } - - public Date getConfirmDate() - { - return confirmDate; - } - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - public String getDeptName() - { - return deptName; - } - 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 setDeptNo(String deptNo) - { - this.deptNo = deptNo; - } - - public String getDeptNo() - { - return deptNo; - } - - @Override - public String toString() { - return "WarehousingOutHead{" + - "warehousingOutNo='" + warehousingOutNo + '\'' + - ", workOrderNo='" + workOrderNo + '\'' + - ", warehousingOutDate=" + warehousingOutDate + - ", linkman='" + linkman + '\'' + - ", stockNo='" + stockNo + '\'' + - ", stockName='" + stockName + '\'' + - ", warehouseKeeper='" + warehouseKeeper + '\'' + - ", outputClass='" + outputClass + '\'' + - ", itemClass='" + itemClass + '\'' + - ", confirmFlag=" + confirmFlag + - ", confirmMan='" + confirmMan + '\'' + - ", confirmDate=" + confirmDate + - ", deptName='" + deptName + '\'' + - ", spare1='" + spare1 + '\'' + - ", spare2='" + spare2 + '\'' + - ", spare3='" + spare3 + '\'' + - ", spare4='" + spare4 + '\'' + - ", spare5='" + spare5 + '\'' + - ", spare6='" + spare6 + '\'' + - ", deptNo='" + deptNo + '\'' + - ", warehousingOutLists=" + warehousingOutLists + - '}'; - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehousingOutHeadMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehousingOutHeadMapper.java deleted file mode 100644 index d748a76c..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/WarehousingOutHeadMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.stock.mapper; - -import com.ruoyi.stock.domain.WarehousingOutHead; - -import java.util.List; - -/** - * 出库Mapper接口 - * - * @author ruoyi - * @date 2021-12-16 - */ -public interface WarehousingOutHeadMapper -{ - /** - * 查询出库 - * - * @param warehousingOutNo 出库ID - * @return 出库 - */ - public WarehousingOutHead selectWarehousingOutHeadById(String warehousingOutNo); - - /** - * 查询出库列表 - * - * @param warehousingOutHead 出库 - * @return 出库集合 - */ - public List selectWarehousingOutHeadList(WarehousingOutHead warehousingOutHead); - - /** - * 新增出库 - * - * @param warehousingOutHead 出库 - * @return 结果 - */ - public int insertWarehousingOutHead(WarehousingOutHead warehousingOutHead); - - /** - * 修改出库 - * - * @param warehousingOutHead 出库 - * @return 结果 - */ - public int updateWarehousingOutHead(WarehousingOutHead warehousingOutHead); - - /** - * 删除出库 - * - * @param warehousingOutNo 出库ID - * @return 结果 - */ - public int deleteWarehousingOutHeadById(String warehousingOutNo); - - /** - * 批量删除出库 - * - * @param warehousingOutNos 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingOutHeadByIds(String[] warehousingOutNos); - - public int selectCountByDay(); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IWarehousingOutHeadService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IWarehousingOutHeadService.java deleted file mode 100644 index 4c671024..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/IWarehousingOutHeadService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.ruoyi.stock.service; - -import com.ruoyi.stock.domain.WarehousingOutHead; -import com.ruoyi.stock.domain.WarehousingOutHeadWithList; - -import java.util.List; - -/** - * 出库Service接口 - * - * @author ruoyi - * @date 2021-12-16 - */ -public interface IWarehousingOutHeadService -{ - /** - * 查询出库 - * - * @param warehousingOutNo 出库ID - * @return 出库 - */ - public WarehousingOutHead selectWarehousingOutHeadById(String warehousingOutNo); - - /** - * 查询出库列表 - * - * @param warehousingOutHead 出库 - * @return 出库集合 - */ - public List selectWarehousingOutHeadList(WarehousingOutHead warehousingOutHead); - - /** - * 新增出库 - * - * @param warehousingOutHead 出库 - * @return 结果 - */ - public int insertWarehousingOutHead(WarehousingOutHead warehousingOutHead); - - /** - * 修改出库 - * - * @param warehousingOutHead 出库 - * @return 结果 - */ - public int updateWarehousingOutHead(WarehousingOutHead warehousingOutHead); - - /** - * 批量删除出库 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingOutHeadByIds(String ids); - - /** - * 删除出库信息 - * - * @param warehousingOutNo 出库ID - * @return 结果 - */ - public int deleteWarehousingOutHeadById(String warehousingOutNo); - - public List selectWarehousingOutHeadWithList(WarehousingOutHeadWithList warehousingOutHeadWithList); - - public String getWarehousingOutNo(); - - public int insertByWorkOrder(WarehousingOutHead warehousingOutHead); - - public int insertByScrapItem(WarehousingOutHead warehousingOutHead); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingOutHeadServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingOutHeadServiceImpl.java deleted file mode 100644 index bdbdc711..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/service/impl/WarehousingOutHeadServiceImpl.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.ruoyi.stock.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.produce.domain.WorkorderList; -import com.ruoyi.produce.mapper.WorkorderListMapper; -import com.ruoyi.stock.domain.*; -import com.ruoyi.stock.mapper.*; -import com.ruoyi.stock.service.IWarehousingOutHeadService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.List; - -/** - * 出库Service业务层处理 - * - * @author ruoyi - * @date 2021-12-16 - */ -@Service -public class WarehousingOutHeadServiceImpl implements IWarehousingOutHeadService { - @Autowired - private WarehousingOutHeadMapper warehousingOutHeadMapper; - - @Autowired - private WarehousingOutHeadWithListMapper warehousingOutHeadWithListMapper; - - @Autowired - private WarehousingOutListMapper warehousingOutListMapper; - - @Autowired - private StockInfoMapper stockInfoMapper; - - @Autowired - private WarehouseMapper warehouseMapper; - - @Autowired - private WorkorderListMapper workorderListMapper; - - @Autowired - private WarehousingRecordMapper warehousingRecordMapper; - - /** - * 查询出库 - * - * @param warehousingOutNo 出库ID - * @return 出库 - */ - @Override - public WarehousingOutHead selectWarehousingOutHeadById(String warehousingOutNo) { - return warehousingOutHeadMapper.selectWarehousingOutHeadById(warehousingOutNo); - } - - /** - * 查询出库列表 - * - * @param warehousingOutHead 出库 - * @return 出库 - */ - @Override - public List selectWarehousingOutHeadList(WarehousingOutHead warehousingOutHead) { - return warehousingOutHeadMapper.selectWarehousingOutHeadList(warehousingOutHead); - } - - /** - * 新增出库 - * - * @param warehousingOutHead 出库 - * @return 结果 - */ - @Override - public int insertWarehousingOutHead(WarehousingOutHead warehousingOutHead) { - return warehousingOutHeadMapper.insertWarehousingOutHead(warehousingOutHead); - } - - /** - * 修改出库 - * - * @param warehousingOutHead 出库 - * @return 结果 - */ - @Override - public int updateWarehousingOutHead(WarehousingOutHead warehousingOutHead) { - return warehousingOutHeadMapper.updateWarehousingOutHead(warehousingOutHead); - } - - /** - * 删除出库对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWarehousingOutHeadByIds(String ids) { - return warehousingOutHeadMapper.deleteWarehousingOutHeadByIds(Convert.toStrArray(ids)); - } - - /** - * 删除出库信息 - * - * @param warehousingOutNo 出库ID - * @return 结果 - */ - @Override - public int deleteWarehousingOutHeadById(String warehousingOutNo) { - return warehousingOutHeadMapper.deleteWarehousingOutHeadById(warehousingOutNo); - } - - @Override - public List selectWarehousingOutHeadWithList(WarehousingOutHeadWithList warehousingOutHeadWithList) { - return warehousingOutHeadWithListMapper.selectWarehousingOutHeadWithList(warehousingOutHeadWithList); - } - - @Override - public String getWarehousingOutNo() { - int todayNum = warehousingOutHeadMapper.selectCountByDay() + 1; - String warehousingOutNo = "OUT" + (LocalDate.now().toString().replaceAll("-", "")); - if (todayNum < 10) { - warehousingOutNo += "00" + todayNum; - } else if (todayNum < 100) { - warehousingOutNo += "0" + todayNum; - } else { - warehousingOutNo += todayNum; - } - return warehousingOutNo; - } - - @Override - public int insertByWorkOrder(WarehousingOutHead warehousingOutHead) { - List list = warehousingOutHead.getWarehousingOutLists(); - for (int i = 0; i < list.size(); i++) { - - //循环赋值添加出库记录 - WarehousingOutList warehousingOutList = list.get(i); - warehousingOutList.setWarehousingOutNo(warehousingOutHead.getWarehousingOutNo()); - warehousingOutList.setItemNo(i + 1 + ""); - warehousingOutListMapper.insertWarehousingOutList(warehousingOutList); - - //从库存减去出库数量 - Warehouse warehouse = new Warehouse(); - warehouse.setWlCode(warehousingOutList.getItemCode()); - warehouse.setQty(warehousingOutList.getRealQty()); - warehouseMapper.minusQty(warehouse); - - //修改制工单物料已领数量 - WorkorderList workorderList = new WorkorderList(); - workorderList.setPoId(warehousingOutHead.getWorkOrderNo()); - workorderList.setWlCode(warehousingOutList.getItemCode()); - workorderList.setOrderQty(new BigDecimal(warehousingOutList.getRealQty())); - workorderListMapper.updateWorkorderList(workorderList); - - //修改入库数量(先减最早入库的,依次减直到0) - Long realQty = warehousingOutList.getRealQty(); - while (realQty > 0) { - WarehousingRecord record = warehousingRecordMapper.selectRecentlyRecord(warehousingOutList.getItemCode()); - int surplusQty = Integer.parseInt(record.getSurplusQty()); - if (realQty >= surplusQty) { - record.setSurplusQty("0"); - realQty -= surplusQty; - } else { - record.setSurplusQty(surplusQty - realQty + ""); - realQty = 0L; - } - warehousingRecordMapper.updateWarehousingRecord(record); - } - } - StockInfo stockInfo = new StockInfo(); - stockInfo.setStockName(warehousingOutHead.getStockName()); - List getStock = stockInfoMapper.selectStockInfoList(stockInfo); - warehousingOutHead.setStockNo(getStock.get(0).getStockNO()); - return warehousingOutHeadMapper.insertWarehousingOutHead(warehousingOutHead); - } - - @Override - public int insertByScrapItem(WarehousingOutHead warehousingOutHead) { - List list = warehousingOutHead.getWarehousingOutLists(); - for (int i = 0; i < list.size(); i++) { - - //循环赋值添加出库记录 - WarehousingOutList warehousingOutList = list.get(i); - warehousingOutList.setWarehousingOutNo(warehousingOutHead.getWarehousingOutNo()); - warehousingOutList.setItemNo(i + 1 + ""); - warehousingOutListMapper.insertWarehousingOutList(warehousingOutList); - - //从库存减去出库数量 - Warehouse warehouse = new Warehouse(); - warehouse.setWlCode(warehousingOutList.getItemCode()); - warehouse.setQty(warehousingOutList.getRealQty()); - warehouseMapper.minusQty(warehouse); - - //修改入库数量 - String spare1 = warehousingOutList.getSpare1(); - WarehousingRecord warehousingRecord = new WarehousingRecord(); - warehousingRecord.setWarehousingrecordNo(spare1); - warehousingRecord.setSurplusQty(warehousingOutList.getRealQty() + ""); - warehousingRecordMapper.updateSurplusQty(warehousingRecord); - } - StockInfo stockInfo = new StockInfo(); - stockInfo.setStockName(warehousingOutHead.getStockName()); - List getStock = stockInfoMapper.selectStockInfoList(stockInfo); - warehousingOutHead.setStockNo(getStock.get(0).getStockNO()); - return warehousingOutHeadMapper.insertWarehousingOutHead(warehousingOutHead); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/stock/WarehousingOutHeadMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/WarehousingOutHeadMapper.xml deleted file mode 100644 index 8b58c107..00000000 --- a/ruoyi-admin/src/main/resources/mapper/stock/WarehousingOutHeadMapper.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select warehousingOutNo, workOrderNo, warehousingOutDate, linkman, stockNo, stockName, warehouseKeeper, outputClass, itemClass, confirmFlag, confirmMan, confirmDate, deptName, spare1, spare2, spare3, spare4, spare5, spare6, deptNo from warehousing_out_head - - - - - - - - insert into warehousing_out_head - - warehousingOutNo, - workOrderNo, - warehousingOutDate, - linkman, - stockNo, - stockName, - warehouseKeeper, - outputClass, - itemClass, - confirmFlag, - confirmMan, - confirmDate, - deptName, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, - deptNo, - - - #{warehousingOutNo}, - #{workOrderNo}, - #{warehousingOutDate}, - #{linkman}, - #{stockNo}, - #{stockName}, - #{warehouseKeeper}, - #{outputClass}, - #{itemClass}, - #{confirmFlag}, - #{confirmMan}, - #{confirmDate}, - #{deptName}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - #{deptNo}, - - - - - update warehousing_out_head - - workOrderNo = #{workOrderNo}, - warehousingOutDate = #{warehousingOutDate}, - linkman = #{linkman}, - stockNo = #{stockNo}, - stockName = #{stockName}, - warehouseKeeper = #{warehouseKeeper}, - outputClass = #{outputClass}, - itemClass = #{itemClass}, - confirmFlag = #{confirmFlag}, - confirmMan = #{confirmMan}, - confirmDate = #{confirmDate}, - deptName = #{deptName}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, - deptNo = #{deptNo}, - - where warehousingOutNo = #{warehousingOutNo} - - - - delete from warehousing_out_head where warehousingOutNo = #{warehousingOutNo} - - - - delete from warehousing_out_head where warehousingOutNo in - - #{warehousingOutNo} - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/YLOut.html b/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/YLOut.html deleted file mode 100644 index 44b2e62e..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/YLOut.html +++ /dev/null @@ -1,538 +0,0 @@ - - - - - - - - - - - -
-
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - -
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
- - - - - - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - -
-
- - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/add.html b/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/add.html deleted file mode 100644 index 69abdd5b..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/add.html +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/edit.html b/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/edit.html deleted file mode 100644 index 2f163036..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/edit.html +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - -
-
- -
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/scrap.html b/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/scrap.html deleted file mode 100644 index d485de77..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/scrap.html +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - - - - - - -
-
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - -
-
-
-
-
- -
-
-
-
- -
-
- - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/warehousingOutHead.html b/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/warehousingOutHead.html deleted file mode 100644 index eaf5447d..00000000 --- a/ruoyi-admin/src/main/resources/templates/stock/warehousingOutHead/warehousingOutHead.html +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - -
-
-
-
-
-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - - - - -
  • - - - - - - - - - - - -
  • - - -
  • - - - - - - - - - - -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • - - -
  • - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • -  搜索 -  重置 -
  • -
-
-
-
- - -
-
-
-
-
- - - - - \ No newline at end of file