From 40450a24e7703d432d5d0b6f484b023d4342bdbd Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 13 Aug 2024 15:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=9F=8E=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E7=89=A9=E6=96=99=E5=8C=85=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MaterialArtificerServiceImpl.java    | 35 ++++++++++---------
 .../service/impl/MaterialServiceImpl.java     |  3 ++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
index 3a0c619..db2058b 100644
--- a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
+++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
@@ -148,22 +148,25 @@ public class MaterialArtificerServiceImpl extends ServiceImpl<MaterialArtificerM
        }
        //根据物料包id和技师id查询技师对应物料包
        MaterialArtificer materialArtificer = baseMapper.selectOne(new QueryWrapper<MaterialArtificer>().eq("artificer_id",artificer.getArtificerId()).eq("material_id",material.getId()));
-      //修改物料包数量
-       materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number)));
-       baseMapper.updateById(materialArtificer);
-        //修改剩余量，执行新增历史记录
-        MaterialRecord materialRecord = new MaterialRecord();
-        materialRecord.setMaterialId(materialArtificer.getMaterialId());
-        materialRecord.setType(1);
-        materialRecord.setTotal(materialArtificer.getResidue());
-        materialRecord.setNumber(BigDecimal.valueOf(number));
-        materialRecord.setUpdateTime(new Date());
-        materialRecord.setCreateTime(new Date());
-        materialRecord.setCreateUser(Long.valueOf(materialArtificer.getArtificerId()));
-        materialRecord.setArtificerId(materialArtificer.getArtificerId());
-        materialRecord.setUpdateUser(Long.valueOf(materialArtificer.getArtificerId()));
-        materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量：":"减少剩余数量：")+materialArtificer.getResidue()+"总和："+materialRecord.getTotal());
-        materialRecordService.addMaterialRecord(materialRecord);
+       if(materialArtificer != null && materialArtificer.getResidue() !=null){
+           //修改物料包数量
+           materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number)));
+           baseMapper.updateById(materialArtificer);
+           //修改剩余量，执行新增历史记录
+           MaterialRecord materialRecord = new MaterialRecord();
+           materialRecord.setMaterialId(materialArtificer.getMaterialId());
+           materialRecord.setType(1);
+           materialRecord.setTotal(materialArtificer.getResidue());
+           materialRecord.setNumber(BigDecimal.valueOf(number));
+           materialRecord.setUpdateTime(new Date());
+           materialRecord.setCreateTime(new Date());
+           materialRecord.setCreateUser(Long.valueOf(materialArtificer.getArtificerId()));
+           materialRecord.setArtificerId(materialArtificer.getArtificerId());
+           materialRecord.setUpdateUser(Long.valueOf(materialArtificer.getArtificerId()));
+           materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量：":"减少剩余数量：")+materialArtificer.getResidue()+"总和："+materialRecord.getTotal());
+           materialRecordService.addMaterialRecord(materialRecord);
+       }
+
     }
 }
 
diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java
index ae42e81..625aace 100644
--- a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java
@@ -174,6 +174,9 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
             IPage<MaterialArtificerResult> page1 = new Page(page, limit);
             IPage<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer);
             for(MaterialArtificerResult par:materialIPage.getRecords()){
+                if(par.getResidue() == null){
+                    par.setResidue(BigDecimal.ZERO);
+                }
                 if(par.getResidue().compareTo(BigDecimal.ZERO)<0){
                     par.setResidue(BigDecimal.ZERO);
                 }