接口修改

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanBeforeServiceImpl.java

@@ -134,6 +134,9 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 
         BillCleanBefore cleanBefore = billCleanBeforeMapper.selectById(id);
+        if (cleanBefore.getBillStatus() != 0) {
+            return new Result(10001, "此条记录已被他人修改，请退出刷新查看！", false);
+        }
         cleanBefore.setImgUrl(s);
         cleanBefore.setImgStatus(1);
 

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -877,6 +877,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
 
         if ("1".equals(type)) {
             BillClean billClean = cleanMapper.selectById(id);//某条洗消记录
+            if (billClean.getBillStatus() != 0) {
+                return new Result(10001, "此条记录已被他人修改，请退出刷新查看！", false);
+            }
             QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
             BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
@@ -909,7 +912,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billClean.getProcessId(), billClean.getFarmId(), billClean.getTestLocation(), billClean.getTestLocationId(),
                         billClean.getVistitType(), billClean.getPhone(), billClean.getDepartureName(), billClean.getDepartureId());
                 if (nextId == 0) {
-                    if (StringUtils.isBlank(splits[1])) {
+                    if (splits.length == 1) {
                         baseProcess.setProcessType(1);
                         if (allLocationId.length() > 9) {
                             baseProcess.setAllLocationStatus("2,2,2,2,2,2,2");
@@ -918,7 +921,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         } else {
                             baseProcess.setAllLocationStatus("2,2,2");
                         }
-                    } else {
+                    }  else {
                         String[] strings = allLocationId.split(",");
                         Integer index = 0;
                         for (int i = 0; i < strings.length; i++) {
@@ -1188,6 +1191,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
 
         } else {
             BillDry billClean = dryMapper.selectById(id);//某条烘干记录
+            if (billClean.getBillStatus() != 0) {
+                return new Result(10001, "此条记录已被他人修改，请退出刷新查看！", false);
+            }
             QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
             BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
@@ -1226,7 +1232,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             billClean.getProcessId(), billClean.getFarmId(), billClean.getTestLocation(), billClean.getTestLocationId(),
                             billClean.getVistitType(), billClean.getPhone(), billClean.getDepartureName(), billClean.getDepartureId());
                     if (nextId == 0) {
-                        if (StringUtils.isBlank(splits[1])) {
+                        if (splits.length == 1) {
                             baseProcess.setProcessType(1);
                             if (allLocationId.length() > 9) {
                                 baseProcess.setAllLocationStatus("2,2,2,2,2,2,2");
@@ -1235,7 +1241,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             } else {
                                 baseProcess.setAllLocationStatus("2,2,2");
                             }
-                        } else {
+                        }  else {
                             String[] strings = allLocationId.split(",");
                             Integer index = 0;
                             for (int i = 0; i < strings.length; i++) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillGoodsInventoryServiceImpl.java

@@ -76,6 +76,9 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         BillGoodsInventory goodsInventory = inventoryMapper.selectById(id);
+        if (goodsInventory.getBillStatus() != 0) {
+            return new Result(10001, "此条记录已被他人修改，请退出刷新查看！", false);
+        }
         String goodsName = "";
         String goodsType = "";
         String goodsNum = "";

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -367,6 +367,9 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             date = sdf.format(new Date());
         }
         BillPcr billPcr = pcrMapper.selectById(id);
+        if (billPcr.getBillStatus() != 0) {
+            return new Result(10001, "此条记录已被他人修改，请退出刷新查看！", false);
+        }
         billPcr.setImgUrl(s);
         billPcr.setImgStatus(1);
 

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -1553,6 +1553,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String id = paramsMap.get("id");
         String farmId = paramsMap.get("farmId");
         BillIsolate billIsolate = isolateMapper.selectById(id);
+        if (billIsolate.getBillStatus() == 2 || billIsolate.getBillStatus() == 3) {
+            return new Result(10001, "隔离已完成或提前解除，无需再次修改！", false);
+        }
         BaseProcess baseProcess = processMapper.selectById(billIsolate.getProcessId());
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
         locationQueryWrapper.eq("id", billIsolate.getIsolateLocationId());
@@ -1569,7 +1572,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billIsolate.getProcessId(), billIsolate.getFarmId(), billIsolate.getIsolateLocation(), billIsolate.getIsolateLocationId(),
                 billIsolate.getVistitType(),billIsolate.getPhone(),billIsolate.getDepartureName(),billIsolate.getDepartureId());
         if (nextId == 0) {
-            if (StringUtils.isBlank(splits[1])) {
+            if (splits.length == 1) {
                 baseProcess.setProcessType(1);
                 if (allLocationId.length() > 9) {
                     baseProcess.setAllLocationStatus("2,2,2,2,2,2,2");
@@ -1578,7 +1581,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 } else {
                     baseProcess.setAllLocationStatus("2,2,2");
                 }
-            } else {
+            }  else {
                 String[] strings = allLocationId.split(",");
                 Integer index = 0;
                 for (int i = 0; i < strings.length; i++) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -137,6 +137,9 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 
         BillSampling sampling = billSamplingMapper.selectById(id);
+        if (sampling.getBillStatus() != 0) {
+            return new Result(10001, "此条记录已被他人修改，请退出刷新查看！", false);
+        }
         sampling.setImgUrl(s);
         sampling.setImgStatus(1);