diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingStagnantMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingStagnantMaterialController.java deleted file mode 100644 index e80c531d..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingStagnantMaterialController.java +++ /dev/null @@ -1,229 +0,0 @@ -package com.ruoyi.storehouse.controller; - -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.storehouse.domain.WarehousingStagnantMaterial; -import com.ruoyi.storehouse.service.IWarehousingStagnantMaterialService; -import com.ruoyi.storehouse.utils.DateCheckUtil; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; - -/** - * 呆滞物料Controller - * - * @author ruoyi - * @date 2023-05-12 - */ -@Controller -@RequestMapping("/storehouse/warehousingStagnantMaterial") -public class WarehousingStagnantMaterialController extends BaseController -{ - private String prefix = "storehouse/warehousingStagnantMaterial"; - - @Autowired - private IWarehousingStagnantMaterialService warehousingStagnantMaterialService; - - @RequiresPermissions("storehouse:warehousingStagnantMaterial:view") - @GetMapping() - public String warehousingStagnantMaterial() - { - return prefix + "/warehousingStagnantMaterial"; - } - - /** - * 查询呆滞物料列表 - */ - @RequiresPermissions("storehouse:warehousingStagnantMaterial:list") - @PostMapping("/listIn") - @ResponseBody - public TableDataInfo listIn(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - startPage(); - List list = warehousingStagnantMaterialService.selectStagnantMaterialInList(warehousingStagnantMaterial); - return getDataTable(list); - } - @RequiresPermissions("storehouse:warehousingStagnantMaterial:list") - @PostMapping("/listOut") - @ResponseBody - public TableDataInfo listOut(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - startPage(); - List list = warehousingStagnantMaterialService.selectStagnantMaterialOutList(warehousingStagnantMaterial); - return getDataTable(list); - } - - @RequiresPermissions("storehouse:warehousingStagnantMaterial:list") - @PostMapping("/listYL") - @ResponseBody - public TableDataInfo listYL(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - startPage(); - List list = warehousingStagnantMaterialService.selectStagnantMaterialYLList(warehousingStagnantMaterial); - List list1 = new ArrayList<>(); - for (int i=0;i list = warehousingStagnantMaterialService.selectStagnantMaterialCPList(warehousingStagnantMaterial); - List list2 = new ArrayList<>(); - for (int i=0;i listALL = warehousingStagnantMaterialService.selectStagnantMaterialALLList(warehousingStagnantMaterial); - List list1 = new ArrayList<>(); - List list2 = new ArrayList<>(); - List list = new ArrayList<>(); - for (int i=0;i list = warehousingStagnantMaterialService.selectWarehousingStagnantMaterialList(warehousingStagnantMaterial); -// ExcelUtil util = new ExcelUtil(WarehousingStagnantMaterial.class); -// return util.exportExcel(list, "呆滞物料数据"); -// } -// -// /** -// * 新增呆滞物料 -// */ -// @GetMapping("/add") -// public String add() -// { -// return prefix + "/add"; -// } -// -// /** -// * 新增保存呆滞物料 -// */ -// @RequiresPermissions("storehouse:warehousingStagnantMaterial:add") -// @Log(title = "呆滞物料", businessType = BusinessType.INSERT) -// @PostMapping("/add") -// @ResponseBody -// public AjaxResult addSave(WarehousingStagnantMaterial warehousingStagnantMaterial) -// { -// return toAjax(warehousingStagnantMaterialService.insertWarehousingStagnantMaterial(warehousingStagnantMaterial)); -// } -// -// /** -// * 修改呆滞物料 -// */ -// @GetMapping("/edit/{date}") -// public String edit(@PathVariable("date") String date, ModelMap mmap) -// { -// WarehousingStagnantMaterial warehousingStagnantMaterial = warehousingStagnantMaterialService.selectWarehousingStagnantMaterialById(date); -// mmap.put("warehousingStagnantMaterial", warehousingStagnantMaterial); -// return prefix + "/edit"; -// } -// -// /** -// * 修改保存呆滞物料 -// */ -// @RequiresPermissions("storehouse:warehousingStagnantMaterial:edit") -// @Log(title = "呆滞物料", businessType = BusinessType.UPDATE) -// @PostMapping("/edit") -// @ResponseBody -// public AjaxResult editSave(WarehousingStagnantMaterial warehousingStagnantMaterial) -// { -// return toAjax(warehousingStagnantMaterialService.updateWarehousingStagnantMaterial(warehousingStagnantMaterial)); -// } -// -// /** -// * 删除呆滞物料 -// */ -// @RequiresPermissions("storehouse:warehousingStagnantMaterial:remove") -// @Log(title = "呆滞物料", businessType = BusinessType.DELETE) -// @PostMapping( "/remove") -// @ResponseBody -// public AjaxResult remove(String ids) -// { -// return toAjax(warehousingStagnantMaterialService.deleteWarehousingStagnantMaterialByIds(ids)); -// } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingStagnantMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingStagnantMaterial.java deleted file mode 100644 index 051ac487..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingStagnantMaterial.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.ruoyi.storehouse.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; - -/** - * 呆滞物料对象 warehousing_stagnant_material - * - * @author ruoyi - * @date 2023-05-12 - */ -public class WarehousingStagnantMaterial extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 日期 */ - @Excel(name = "日期") - private String date; - - /** 仓库号 */ - @Excel(name = "仓库号") - private String stockNumber; - - /** 仓库名称 */ - @Excel(name = "仓库名称") - private String stockName; - - /** 物料代码 */ - @Excel(name = "物料代码") - private String materialCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String materialName; - - /** 物料类型 */ - @Excel(name = "物料类型") - private String materialType; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 机种 */ - @Excel(name = "机种") - private String typeMachine; - - /** 单位 */ - @Excel(name = "单位") - private String inventoryUnit; - - /** 库存数 */ - @Excel(name = "库存数") - private String inventoryQuantity; - - public void setDate(String date) - { - this.date = date; - } - - public String getDate() - { - return date; - } - public void setStockNumber(String stockNumber) - { - this.stockNumber = stockNumber; - } - - public String getStockNumber() - { - return stockNumber; - } - public void setStockName(String stockName) - { - this.stockName = stockName; - } - - public String getStockName() - { - return stockName; - } - public void setMaterialCode(String materialCode) - { - this.materialCode = materialCode; - } - - public String getMaterialCode() - { - return materialCode; - } - public void setMaterialName(String materialName) - { - this.materialName = materialName; - } - - public String getMaterialName() - { - return materialName; - } - public void setMaterialType(String materialType) - { - this.materialType = materialType; - } - - public String getMaterialType() - { - return materialType; - } - public void setSpecificationModel(String specificationModel) - { - this.specificationModel = specificationModel; - } - - public String getSpecificationModel() - { - return specificationModel; - } - public void setTypeMachine(String typeMachine) - { - this.typeMachine = typeMachine; - } - - public String getTypeMachine() - { - return typeMachine; - } - public void setInventoryUnit(String inventoryUnit) - { - this.inventoryUnit = inventoryUnit; - } - - public String getInventoryUnit() - { - return inventoryUnit; - } - public void setInventoryQuantity(String inventoryQuantity) - { - this.inventoryQuantity = inventoryQuantity; - } - - public String getInventoryQuantity() - { - return inventoryQuantity; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("date", getDate()) - .append("stockNumber", getStockNumber()) - .append("stockName", getStockName()) - .append("materialCode", getMaterialCode()) - .append("materialName", getMaterialName()) - .append("materialType", getMaterialType()) - .append("specificationModel", getSpecificationModel()) - .append("typeMachine", getTypeMachine()) - .append("inventoryUnit", getInventoryUnit()) - .append("inventoryQuantity", getInventoryQuantity()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingStagnantMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingStagnantMaterialMapper.java deleted file mode 100644 index 1f7c71a4..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingStagnantMaterialMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.ruoyi.storehouse.mapper; - -import com.ruoyi.storehouse.domain.WarehousingStagnantMaterial; - -import java.util.List; - -/** - * 呆滞物料Mapper接口 - * - * @author ruoyi - * @date 2023-05-12 - */ -public interface WarehousingStagnantMaterialMapper -{ - /** - * 查询呆滞物料 - * - * @param date 呆滞物料ID - * @return 呆滞物料 - */ - public WarehousingStagnantMaterial selectWarehousingStagnantMaterialById(String date); - - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ -// public List selectWarehousingStagnantMaterialList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialInList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialOutList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialYLList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialCPList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialALLList(WarehousingStagnantMaterial warehousingStagnantMaterial); - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingStagnantMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingStagnantMaterialService.java deleted file mode 100644 index eedb265a..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingStagnantMaterialService.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.ruoyi.storehouse.service; - -import com.ruoyi.storehouse.domain.WarehousingStagnantMaterial; - -import java.util.List; - -/** - * 呆滞物料Service接口 - * - * @author ruoyi - * @date 2023-05-12 - */ -public interface IWarehousingStagnantMaterialService -{ - /** - * 查询呆滞物料 - * - * @param date 呆滞物料ID - * @return 呆滞物料 - */ - public WarehousingStagnantMaterial selectWarehousingStagnantMaterialById(String date); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ -// public List selectWarehousingStagnantMaterialList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialInList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialOutList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialYLList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialCPList(WarehousingStagnantMaterial warehousingStagnantMaterial); - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料集合 - */ - public List selectStagnantMaterialALLList(WarehousingStagnantMaterial warehousingStagnantMaterial); - -// /** -// * 新增呆滞物料 -// * -// * @param warehousingStagnantMaterial 呆滞物料 -// * @return 结果 -// */ -// public int insertWarehousingStagnantMaterial(WarehousingStagnantMaterial warehousingStagnantMaterial); -// -// /** -// * 修改呆滞物料 -// * -// * @param warehousingStagnantMaterial 呆滞物料 -// * @return 结果 -// */ -// public int updateWarehousingStagnantMaterial(WarehousingStagnantMaterial warehousingStagnantMaterial); -// -// /** -// * 批量删除呆滞物料 -// * -// * @param ids 需要删除的数据ID -// * @return 结果 -// */ -// public int deleteWarehousingStagnantMaterialByIds(String ids); -// -// /** -// * 删除呆滞物料信息 -// * -// * @param date 呆滞物料ID -// * @return 结果 -// */ -// public int deleteWarehousingStagnantMaterialById(String date); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingStagnantMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingStagnantMaterialServiceImpl.java deleted file mode 100644 index 0ae557dd..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingStagnantMaterialServiceImpl.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.ruoyi.storehouse.service.impl; - -import com.ruoyi.storehouse.domain.WarehousingStagnantMaterial; -import com.ruoyi.storehouse.mapper.WarehousingStagnantMaterialMapper; -import com.ruoyi.storehouse.service.IWarehousingStagnantMaterialService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 呆滞物料Service业务层处理 - * - * @author ruoyi - * @date 2023-05-12 - */ -@Service -public class WarehousingStagnantMaterialServiceImpl implements IWarehousingStagnantMaterialService -{ - @Autowired - private WarehousingStagnantMaterialMapper warehousingStagnantMaterialMapper; - - /** - * 查询呆滞物料 - * - * @param date 呆滞物料ID - * @return 呆滞物料 - */ - @Override - public WarehousingStagnantMaterial selectWarehousingStagnantMaterialById(String date) - { - return warehousingStagnantMaterialMapper.selectWarehousingStagnantMaterialById(date); - } - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料 - */ -// @Override -// public List selectWarehousingStagnantMaterialList(WarehousingStagnantMaterial warehousingStagnantMaterial) -// { -// return warehousingStagnantMaterialMapper.selectWarehousingStagnantMaterialList(warehousingStagnantMaterial); -// } - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料 - */ - @Override - public List selectStagnantMaterialInList(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - return warehousingStagnantMaterialMapper.selectStagnantMaterialInList(warehousingStagnantMaterial); - } - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料 - */ - @Override - public List selectStagnantMaterialOutList(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - return warehousingStagnantMaterialMapper.selectStagnantMaterialOutList(warehousingStagnantMaterial); - } - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料 - */ - @Override - public List selectStagnantMaterialYLList(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - return warehousingStagnantMaterialMapper.selectStagnantMaterialYLList(warehousingStagnantMaterial); - } - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料 - */ - @Override - public List selectStagnantMaterialCPList(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - return warehousingStagnantMaterialMapper.selectStagnantMaterialCPList(warehousingStagnantMaterial); - } - - /** - * 查询呆滞物料列表 - * - * @param warehousingStagnantMaterial 呆滞物料 - * @return 呆滞物料 - */ - @Override - public List selectStagnantMaterialALLList(WarehousingStagnantMaterial warehousingStagnantMaterial) - { - return warehousingStagnantMaterialMapper.selectStagnantMaterialALLList(warehousingStagnantMaterial); - } -// -// /** -// * 新增呆滞物料 -// * -// * @param warehousingStagnantMaterial 呆滞物料 -// * @return 结果 -// */ -// @Override -// public int insertWarehousingStagnantMaterial(WarehousingStagnantMaterial warehousingStagnantMaterial) -// { -// return warehousingStagnantMaterialMapper.insertWarehousingStagnantMaterial(warehousingStagnantMaterial); -// } -// -// /** -// * 修改呆滞物料 -// * -// * @param warehousingStagnantMaterial 呆滞物料 -// * @return 结果 -// */ -// @Override -// public int updateWarehousingStagnantMaterial(WarehousingStagnantMaterial warehousingStagnantMaterial) -// { -// return warehousingStagnantMaterialMapper.updateWarehousingStagnantMaterial(warehousingStagnantMaterial); -// } -// -// /** -// * 删除呆滞物料对象 -// * -// * @param ids 需要删除的数据ID -// * @return 结果 -// */ -// @Override -// public int deleteWarehousingStagnantMaterialByIds(String ids) -// { -// return warehousingStagnantMaterialMapper.deleteWarehousingStagnantMaterialByIds(Convert.toStrArray(ids)); -// } -// -// /** -// * 删除呆滞物料信息 -// * -// * @param date 呆滞物料ID -// * @return 结果 -// */ -// @Override -// public int deleteWarehousingStagnantMaterialById(String date) -// { -// return warehousingStagnantMaterialMapper.deleteWarehousingStagnantMaterialById(date); -// } -} diff --git a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingStagnantMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingStagnantMaterialMapper.xml deleted file mode 100644 index 903ff8b8..00000000 --- a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingStagnantMaterialMapper.xml +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - --- SELECT --- max(wii.warehousing_date) AS `date`, --- wii.stock_number, --- wii.stock_name, --- wid.material_code, --- wid.material_name, --- wid.specification_model, --- wid.type_machine, --- wid.inventory_unit, --- wid.material_type --- FROM --- warehousing_in_info wii, --- warehousing_in_detail wid --- WHERE --- wii.warehousing_number = wid.warehousing_number --- GROUP by material_code --- having DATEDIFF(now(),MAX(wii.warehousing_date))>30 - SELECT - `date`, - aaa.stock_number, - aaa.stock_name, - aaa.material_code, - aaa.material_name, - aaa.specification_model, - aaa.type_machine, - aaa.inventory_unit, - aaa.material_type, - bbb.stock_quantity AS inventory_quantity - FROM - ( - SELECT - max( wii.warehousing_date ) AS `date`, - wii.stock_number, - wii.stock_name, - wid.material_code, - wid.material_name, - wid.specification_model, - wid.type_machine, - wid.inventory_unit, - wid.material_type - FROM - warehousing_in_info wii, - warehousing_in_detail wid - WHERE - wii.warehousing_number = wid.warehousing_number - GROUP BY - material_code - HAVING - DATEDIFF( - now(), - MAX( wii.warehousing_date ))> 30 - ) AS `aaa`, - ( - SELECT - material_code, - material_name, - material_type, - batch_number, - specification_model, - type_machine, - inventory_unit, - sum( count ) AS stock_quantity, - stock_number, - stock_name, - enterprise_code, - enterprise_name, - storage_location - FROM - ( - SELECT - warehousing_in_detail.material_code AS material_code, - warehousing_in_detail.material_name AS material_name, - warehousing_in_detail.material_type AS material_type, - warehousing_in_detail.batch_number AS batch_number, - warehousing_in_detail.specification_model AS specification_model, - warehousing_in_detail.type_machine AS type_machine, - warehousing_in_detail.inventory_unit AS inventory_unit, - SUM( warehousing_in_detail.warehousing_quantity ) AS `count`, - warehousing_in_info.stock_number AS stock_number, - warehousing_in_info.stock_name AS stock_name, - warehousing_in_info.enterprise_code AS enterprise_code, - warehousing_in_info.enterprise_name AS enterprise_name, - warehousing_in_detail.storage_location AS storage_location - FROM - warehousing_in_detail, - warehousing_in_info - WHERE - warehousing_in_detail.warehousing_number = warehousing_in_info.warehousing_number - GROUP BY - warehousing_in_detail.material_code UNION ALL - SELECT - outbound_detail.material_code AS material_code, - outbound_detail.material_name AS material_name, - outbound_info.material_type AS material_type, - outbound_detail.batch_number AS batch_number, - outbound_detail.specification_model AS specification_model, - outbound_detail.type_machine AS type_machine, - outbound_detail.inventory_unit AS inventory_unit, - - SUM( outbound_detail.actual_count ) AS `count`, - outbound_info.stock_no AS stock_number, - outbound_info.stock_name AS stock_name, - outbound_info.enterprise_code AS enterprise_code, - outbound_info.enterprise_name AS enterprise_name, - outbound_detail.storage_location AS storage_location - FROM - outbound_detail, - outbound_info - WHERE - outbound_detail.outbound_no = outbound_info.outbound_no - GROUP BY - outbound_detail.material_code - ) AS tabletemp - GROUP BY - material_code - ) AS `bbb` - WHERE aaa.material_code = bbb.material_code - - --- SELECT --- SUBSTRING(oi.outbound_date,1,10) AS `date`, --- oi.stock_no AS stock_number, --- oi.stock_name, --- od.material_code, --- od.material_name, --- od.specification_model, --- od.type_machine, --- od.inventory_unit, --- oi.material_type --- FROM --- outbound_info oi, --- outbound_detail od --- WHERE --- oi.outbound_no = od.outbound_no --- GROUP by material_code --- having DATEDIFF(now(),MAX(SUBSTRING(oi.outbound_date,1,10)))>30 - SELECT - `date`, - ccc.stock_number, - ccc.stock_name, - ccc.material_code, - ccc.material_name, - ccc.specification_model, - ccc.type_machine, - ccc.inventory_unit, - ccc.material_type, - bbb.stock_quantity AS inventory_quantity - FROM - ( - SELECT - SUBSTRING(oi.outbound_date,1,10) AS `date`, - oi.stock_no AS stock_number, - oi.stock_name, - od.material_code, - od.material_name, - od.specification_model, - od.type_machine, - od.inventory_unit, - oi.material_type - FROM - outbound_info oi, - outbound_detail od - WHERE - oi.outbound_no = od.outbound_no - GROUP by material_code - having DATEDIFF(now(),MAX(SUBSTRING(oi.outbound_date,1,10)))>30 - ) AS `ccc`, - ( - SELECT - material_code, - material_name, - material_type, - batch_number, - specification_model, - type_machine, - inventory_unit, - sum( count ) AS stock_quantity, - stock_number, - stock_name, - enterprise_code, - enterprise_name, - storage_location - FROM - ( - SELECT - warehousing_in_detail.material_code AS material_code, - warehousing_in_detail.material_name AS material_name, - warehousing_in_detail.material_type AS material_type, - warehousing_in_detail.batch_number AS batch_number, - warehousing_in_detail.specification_model AS specification_model, - warehousing_in_detail.type_machine AS type_machine, - warehousing_in_detail.inventory_unit AS inventory_unit, - SUM( warehousing_in_detail.warehousing_quantity ) AS `count`, - warehousing_in_info.stock_number AS stock_number, - warehousing_in_info.stock_name AS stock_name, - warehousing_in_info.enterprise_code AS enterprise_code, - warehousing_in_info.enterprise_name AS enterprise_name, - warehousing_in_detail.storage_location AS storage_location - FROM - warehousing_in_detail, - warehousing_in_info - WHERE - warehousing_in_detail.warehousing_number = warehousing_in_info.warehousing_number - GROUP BY - warehousing_in_detail.material_code UNION ALL - SELECT - outbound_detail.material_code AS material_code, - outbound_detail.material_name AS material_name, - outbound_info.material_type AS material_type, - outbound_detail.batch_number AS batch_number, - outbound_detail.specification_model AS specification_model, - outbound_detail.type_machine AS type_machine, - outbound_detail.inventory_unit AS inventory_unit, - - SUM( outbound_detail.actual_count ) AS `count`, - outbound_info.stock_no AS stock_number, - outbound_info.stock_name AS stock_name, - outbound_info.enterprise_code AS enterprise_code, - outbound_info.enterprise_name AS enterprise_name, - outbound_detail.storage_location AS storage_location - FROM - outbound_detail, - outbound_info - WHERE - outbound_detail.outbound_no = outbound_info.outbound_no - GROUP BY - outbound_detail.material_code - ) AS tabletemp - GROUP BY - material_code - ) AS `bbb` - WHERE ccc.material_code = bbb.material_code - - - SELECT - `date`, - aaa.stock_number, - aaa.stock_name, - aaa.material_code, - aaa.material_name, - aaa.specification_model, - aaa.type_machine, - aaa.inventory_unit, - aaa.material_type, - bbb.stock_quantity AS inventory_quantity - FROM - ( - SELECT - max( wii.warehousing_date ) AS `date`, - wii.stock_number, - wii.stock_name, - wid.material_code, - wid.material_name, - wid.specification_model, - wid.type_machine, - wid.inventory_unit, - wid.material_type - FROM - warehousing_in_info wii, - warehousing_in_detail wid - WHERE - wii.warehousing_number = wid.warehousing_number - GROUP BY - material_code - ) AS `aaa`, - ( - SELECT - material_code, - material_name, - material_type, - batch_number, - specification_model, - type_machine, - inventory_unit, - sum( count ) AS stock_quantity, - stock_number, - stock_name, - enterprise_code, - enterprise_name, - storage_location - FROM - ( - SELECT - warehousing_in_detail.material_code AS material_code, - warehousing_in_detail.material_name AS material_name, - warehousing_in_detail.material_type AS material_type, - warehousing_in_detail.batch_number AS batch_number, - warehousing_in_detail.specification_model AS specification_model, - warehousing_in_detail.type_machine AS type_machine, - warehousing_in_detail.inventory_unit AS inventory_unit, - SUM( warehousing_in_detail.warehousing_quantity ) AS `count`, - warehousing_in_info.stock_number AS stock_number, - warehousing_in_info.stock_name AS stock_name, - warehousing_in_info.enterprise_code AS enterprise_code, - warehousing_in_info.enterprise_name AS enterprise_name, - warehousing_in_detail.storage_location AS storage_location - FROM - warehousing_in_detail, - warehousing_in_info - WHERE - warehousing_in_detail.warehousing_number = warehousing_in_info.warehousing_number - GROUP BY - warehousing_in_detail.material_code UNION ALL - SELECT - outbound_detail.material_code AS material_code, - outbound_detail.material_name AS material_name, - outbound_info.material_type AS material_type, - outbound_detail.batch_number AS batch_number, - outbound_detail.specification_model AS specification_model, - outbound_detail.type_machine AS type_machine, - outbound_detail.inventory_unit AS inventory_unit, - - SUM( outbound_detail.actual_count ) AS `count`, - outbound_info.stock_no AS stock_number, - outbound_info.stock_name AS stock_name, - outbound_info.enterprise_code AS enterprise_code, - outbound_info.enterprise_name AS enterprise_name, - outbound_detail.storage_location AS storage_location - FROM - outbound_detail, - outbound_info - WHERE - outbound_detail.outbound_no = outbound_info.outbound_no - GROUP BY - outbound_detail.material_code - ) AS tabletemp - GROUP BY - material_code - ) AS `bbb` - WHERE aaa.material_code = bbb.material_code AND bbb.stock_quantity > 0 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/add.html deleted file mode 100644 index 7da3187c..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/add.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/edit.html deleted file mode 100644 index c2510171..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/edit.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -
-
- -
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html deleted file mode 100644 index bd09e688..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
  • -
  • - - -
  • -
  • -  搜索 -  重置 -
  • -
-
-
-
- -
- - - - - - - - - - - - -
-
-
-
-
-
- - - - \ No newline at end of file