加工产品在销售记录表和损耗记录表中加上相应的地块

guoshilong

2022-08-19 4d60a2ee6bbfe76e2740307c832c8f309090a41e

 src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java

@@ -105,8 +105,13 @@
         String s = specs + dic1 + "/" + dic2;
         //出库
         if (pages.getRecords().get(i).getStockType1() == 0) {
            String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
            pages.getRecords().get(i).setCount(count);
            if (pages.getRecords().get(i).getType1().equals("4")){
               String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
               pages.getRecords().get(i).setCount(count);
            }else {
               String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
               pages.getRecords().get(i).setCount(count);
            }
         } else {
            String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
            pages.getRecords().get(i).setCount(count);
@@ -144,6 +149,7 @@
   @ApiOperation(value = "新增", notes = "传入stockrecord")
   public R save(@Valid @RequestBody StockrecordVO stockrecord) {
      Integer stockType1 = stockrecord.getStockType1();
      //0出库 1入库
      //出库
      if (stockType1 == 0) {
         //库存量
@@ -193,8 +199,8 @@
            stock.setState("1");
            stockService.UpdaeAmountc(stock);
            //同时删除所有农资记录
            soldrecordService.delc(stockrecord.getStockId1());
            soldrService.del(stockrecord.getSid());
//            soldrecordService.delc(stockrecord.getStockId1());
//            soldrService.del(stockrecord.getSid());
         } else {
            stock.setState("0");
            stockService.UpdaeAmountc(stock);
@@ -209,7 +215,7 @@
         soldrecord.setType(stockrecord.getType1());
         soldrecord.setSid(stockrecord.getSid());
         String type1 = stockrecord.getType1();
         if (type1.equals("0")) {
         if (type1.equals("0")) { //0 采购入库
            //已出库农资数量记录
            Soldr soldr = new Soldr();
            soldr.setSid(stockrecord.getSid());
@@ -220,9 +226,10 @@
            soldr.setSpecsVal2(stockrecord.getSpecsVal2());
            soldr.setType(stockrecord.getType1());
            soldr.setCensus(v);
            soldr.setDeptId(stockrecord.getDeptId());
            //已出库农资数量
            List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
            if (maps.size()!=0) {
            List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid(),stockrecord.getDeptId());
            if (maps.size()!=0) {//已出库存表中有重复的
               String a = maps.get(0).get("amount1").toString();
               Integer amount11=Integer.parseInt(a);
               String amount12 = maps.get(0).get("amount1").toString();
@@ -323,16 +330,16 @@
      Stockrecord stockRecord = stockrecordService.getById(ids);
      //根据stockRecord中的库存记录id找到对应的库存数据
      Stock stock = stockService.getById(stockRecord.getSid());
      //根据stockRecord中的srId找到对应的已出库记录表的对应数据
      Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
      //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
      Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
      //对库存表操作
      //判断stockType1  0出库  1入库
      if (soldr.getAmount1()!=soldrecord.getAmount1()){
         throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
      }else {
         if (stockRecord.getStockType1() == 0) {
      if (stockRecord.getStockType1() == 0) {
         //根据stockRecord中的srId找到对应的已出库记录表的对应数据
         Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
         //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
         Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
         if (soldr.getAmount1()<soldrecord.getAmount1()){//已出库农资的数量比出库记录表中的数量少，不能回退
            throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
         }else {
            //0出库     删除记录后原库存添加
            stock.setAmount(stock.getAmount() + stockRecord.getAmount1());
            //对已出库表操作   soldr出库数量记录表已出库农资减少     soldrecord出库记录表的数据也要删除
@@ -345,8 +352,13 @@
               soldr.setAmount1(sub);
               soldrService.updateById(soldr);
            }
         }
      }
      else {
         //1 入库    删除记录后原库存减少
         if (stockRecord.getAmount1() > stock.getAmount()) { //出入库记录表中的数量比库存的数量多不让回退
            throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
         } else {
            //1 入库    删除记录后原库存减少
            stock.setAmount(stock.getAmount() - stockRecord.getAmount1());
         }
      }