Merge remote-tracking branch 'origin/dev' into dev

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpAIOController.java

@@ -5,6 +5,7 @@ import com.zd.chemical.domain.HxpStock;
 import com.zd.chemical.domain.HxpUserecord;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.*;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.log.BusinessType;
@@ -189,6 +190,13 @@ public class HxpAIOController extends BaseController {
     @ApiOperation(value = "领用化学品")
     public R<HxpUserecord> addUserecord(@RequestBody @Valid HxpUserecord hxpUserecord) {
         hxpUserecord = hxpUserecordService.insertHxpUserecord(hxpUserecord);
+        //小数点末尾去0处理
+        if (hxpUserecord != null) {
+            hxpUserecord.setLossAmount(ChemicalUtils.removeZeroForAfterPoint(hxpUserecord.getLossAmount()));
+            hxpUserecord.setCollectNowNum(ChemicalUtils.removeZeroForAfterPoint(hxpUserecord.getCollectNowNum()));
+            hxpUserecord.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(hxpUserecord.getCollectStockNum()));
+            hxpUserecord.setReturnStockNum(ChemicalUtils.removeZeroForAfterPoint(hxpUserecord.getReturnStockNum()));
+        }
         return R.ok(hxpUserecord);
     }
 
@@ -223,6 +231,20 @@ public class HxpAIOController extends BaseController {
             }
             hxpStock.setHxpUserecord(userecordList.get(0));
 
+            //新加：去除末尾多余的0
+            hxpStock.setSuttle(ChemicalUtils.removeZeroForAfterPoint(hxpStock.getSuttle()));
+            hxpStock.setChemicalAmount(ChemicalUtils.removeZeroForAfterPoint(hxpStock.getChemicalAmount()));
+            hxpStock.setUsages(ChemicalUtils.removeZeroForAfterPoint(hxpStock.getUsages()));
+            hxpStock.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(hxpStock.getOutUsages()));
+            hxpStock.setTare(ChemicalUtils.removeZeroForAfterPoint(hxpStock.getTare()));
+            //领用信息
+            HxpUserecord userecord = hxpStock.getHxpUserecord();
+            if (userecord != null) {
+                userecord.setLossAmount(ChemicalUtils.removeZeroForAfterPoint(userecord.getLossAmount()));
+                userecord.setCollectNowNum(ChemicalUtils.removeZeroForAfterPoint(userecord.getCollectNowNum()));
+                userecord.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(userecord.getCollectStockNum()));
+                userecord.setReturnStockNum(ChemicalUtils.removeZeroForAfterPoint(userecord.getReturnStockNum()));
+            }
         }else {
             return R.fail("当前化学品已过期或不存在！");
         }
@@ -260,6 +282,14 @@ public class HxpAIOController extends BaseController {
         aioUserecordVo.setUserId(SecurityUtils.getUserId());
         startPage();
         List<AioUserecordVo> list = hxpUserecordService.queryRecordList(aioUserecordVo);
+        //小数点后去0处理
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setUseStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getUseStockNum()));
+                vo.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectStockNum()));
+                vo.setReturnStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getReturnStockNum()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -324,6 +354,13 @@ public class HxpAIOController extends BaseController {
         aioChemicalVo.setSubId(getSubIdByTerminalNum());
         startPage();
         List<AioChemicalVo> list = hxpCabinetJoinCabinetService.selectChemicalVoList(aioChemicalVo);
+        //小数点后去0 处理
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmount(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmount()));
+                vo.setTare(ChemicalUtils.removeZeroForAfterPoint(vo.getTare()));
+            });
+        }
         return getDataTable(list);
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyServiceImpl.java

@@ -6,6 +6,7 @@ import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.*;
 import com.zd.chemical.service.IActAuditconfigService;
 import com.zd.chemical.service.IActHxpapplyService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SaveUtil;
@@ -85,8 +86,6 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                     actRestStockVo.setSubId(actHxpapplyInfoVo.getSubId());
                     actRestStockVo.setCabinetId(b.getCabinetId());
                     actRestStockVo.setChemicalId(b.getChemicalId());
-//                    Map <String, String> restStock = iActHxpapplyService.getRestStock(actRestStockVo);
-//                    b.setRemainingStorage(restStock.get("restStock"));
                     if(pre.test(actApplytasks)){
                         getRestStockClassif(actRestStockVo,b,actHxpapplyInfoVo.getUserId(),apply.getApprovalStatus().intValue());
                     }else{
@@ -95,6 +94,13 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                 });
         List <ActHxpapplyDetailVo> actHxpapplyDetailVos = actHxpapplyDetailMapper.selectApplyDetailList(actHxpapplyDetail);
         consumer.accept(actHxpapplyDetailVos);
+        //小数点后无效0去除
+        if (actHxpapplyDetailVos != null && actHxpapplyDetailVos.size() > 0) {
+            actHxpapplyDetailVos.stream().forEach(vo -> {
+                vo.setApplyNum(ChemicalUtils.removeZeroForAfterPoint(vo.getApplyNum()));
+                vo.setRemainingStorage(ChemicalUtils.removeZeroForAfterPoint(vo.getRemainingStorage()));
+            });
+        }
         actHxpapplyInfoVo.setActHxpapplyDetailList(actHxpapplyDetailVos);
 
         // 查出工作流子节点