| | |
| | | // } |
| | | BigDecimal a1 = new BigDecimal(manPakOut.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN); |
| | | BigDecimal b1 = new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_DOWN); |
| | | Double c1 = a1.subtract(b1).doubleValue(); |
| | | Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_DOWN).doubleValue(); |
| | | if (jsonOrderDetl.getAnfme() > c1) { //判断工作数量是否大于拣货单剩余可出的数量 |
| | | return R.error("出库数量大于拣货单剩余可出数量"); |
| | | } |
| | | |
| | | BigDecimal e1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_DOWN); |
| | | BigDecimal f1 = new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_DOWN); |
| | | Double g1 = e1.subtract(f1).doubleValue(); |
| | | Double g1 = e1.subtract(f1).setScale(2,BigDecimal.ROUND_DOWN).doubleValue(); |
| | | if ( g1 <jsonOrderDetl.getAnfme() ){ |
| | | return R.error("出库数量大于单据剩余可出数量"); |
| | | } |
| | |
| | | if(jsonOrderDetl.getWeight() == null){ |
| | | jsonOrderDetl.setWeight(0.0); |
| | | } |
| | | Double finalQty = new BigDecimal(checkManLocDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue() ; |
| | | Double weight = new BigDecimal(checkManLocDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue() ; |
| | | Double finalQty = new BigDecimal(checkManLocDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue() ; |
| | | Double weight = new BigDecimal(checkManLocDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue() ; |
| | | checkManLocDetl.setAnfme(finalQty); |
| | | checkManLocDetl.setWeight(weight); |
| | | if (weight < 0){ |
| | |
| | | return R.error("修改平库物料失败!"); |
| | | } |
| | | } |
| | | orderDetl.setQty( new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue() ); |
| | | orderDetl.setQty( new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue() ); |
| | | orderDetl.setUpdateTime(date); |
| | | orderDetlService.updateById(orderDetl); |
| | | //更新订单状态 |
| | |
| | | manPakOut.setCount(0.0); |
| | | } |
| | | |
| | | manPakOut.setCount(new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue()); |
| | | manPakOut.setCount(new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue()); |
| | | if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){ |
| | | return R.error("更新拣货单完成数目失败"); |
| | | } |