src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -107,6 +107,28 @@ } /** * 自定义分页 农资库存表 */ @GetMapping("/pages") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入stock") public R<List<StockVO>> pages(StockVO stock) { List<StockVO> pages = stockService.selectListss(stock); for (int i = 0; i < pages.size(); i++) { String specs = pages.get(i).getSpecs(); Integer amount = pages.get(i).getAmount(); Integer num = Integer.parseInt(specs); String dic1 = pages.get(i).getDic1(); String dic2 = pages.get(i).getDic2(); String s = specs + dic1 + "/" + dic2; pages.get(i).setSpn(s); pages.get(i).setCnum(num * amount); } return R.data(pages); } /** * 新增 农资库存表 */ @PostMapping("/save") @@ -235,7 +257,7 @@ */ @GetMapping("/StockCount") public R StockCount(String detpId) { List<Map<String, Object>> maps = stockService.StockCount(detpId); List<Map<String, Object>> maps = stockService.StockCount("1123598813738675201"); //化肥0 double hf = 0; //有机肥1 @@ -434,10 +456,10 @@ * @return */ @GetMapping("/pagenumx") public R pagenumx(String deptId,String startTime, String endTime) { public R pagenumx(String deptId, String startTime, String endTime) { Double rknu = 0.0; Double cknu = 0.0; List<StocksVO> pages = stockService.slectNumx(deptId,startTime, endTime); List<StocksVO> pages = stockService.slectNumx(deptId, startTime, endTime); for (int i = 0; i < pages.size(); i++) { Double cgnum = pages.get(i).getCgnum(); Double dbrknum = pages.get(i).getDbrknum(); src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
@@ -45,6 +45,7 @@ List<StockVO> selectStockPage(IPage page, StockVO stock); List<StockVO> selectLists(IPage page, StockVO stock); List<StockVO> selectListss(StockVO stock); int UpdaeAmountc(@Param("stock") Stock stock); src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -76,6 +76,52 @@ and stf.agricultural_name like concat('%', #{stock.agrname},'%') </if> </select> <select id="selectListss" resultType="org.springblade.modules.stock.vo.StockVO"> SELECT st.*, stf.factory_name AS factoryName, a.dict_value AS stype, d.dict_value AS dic1, c.dict_value AS dic2, stf.agricultural_name as agrname FROM sys_stock st LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs1' AND is_deleted = 0 <if test="stock.codes!=null and stock.codes != ''"> AND blade_dict_biz.tenant_id = #{stock.codes} </if>) d ON d.dict_key = st.specs_value1 LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs2' AND is_deleted = 0 <if test="stock.codes!=null and stock.codes != ''"> AND blade_dict_biz.tenant_id = #{stock.codes} </if>) c ON c.dict_key = st.specs_value2 LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 <if test="stock.codes!=null and stock.codes != ''"> AND blade_dict_biz.tenant_id = #{stock.codes} </if>) a ON a.dict_key = stf.type WHERE st.is_deleted = 0 and state=0 <if test="stock.stype!=null and stock.stype != ''"> and stf.type = #{stock.stype} </if> <if test="stock.specsValue1!=null and stock.specsValue1 != ''"> and st.specs_value1 = #{stock.specsValue1} </if> <if test="stock.specsValue2!=null and stock.specsValue2 != ''"> and st.specs_value2 = #{stock.specsValue2} </if> <if test="stock.state!=null and stock.state != ''"> and st.state = #{stock.state} </if> <if test="stock.type!=null and stock.type != ''"> and st.type = #{stock.type} </if> <if test="stock.agrname!=null and stock.agrname != ''"> and stf.agricultural_name like concat('%', #{stock.agrname},'%') </if> </select> <!--入库出库--> <update id="UpdaeAmountc"> update sys_stock src/main/java/org/springblade/modules/stock/service/IStockService.java
@@ -43,6 +43,7 @@ */ IPage<StockVO> selectStockPage(IPage<StockVO> page, StockVO stock); IPage<StockVO> selectLists(IPage<StockVO> page, StockVO stock); List<StockVO> selectListss(StockVO stock); boolean UpdaeAmountc(Stock stock); boolean Updaet(Stock stock); IPage<StocksVO> slectNum(IPage<StocksVO> page, StocksVO stock); src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
@@ -48,6 +48,11 @@ } @Override public List<StockVO> selectListss(StockVO stock) { return baseMapper.selectListss(stock); } @Override public boolean UpdaeAmountc(Stock stock) { //更新 int i = baseMapper.UpdaeAmountc(stock);