更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -40,7 +40,6 @@ import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
@@ -404,9 +403,11 @@ public class AllotBillController {
 //        fileVoList.add(new FileVo("入库确认单", allotReceiveVo.getReceiveFileName(), allotReceiveVo.getReceiveFileUrl()));
         //更新账单状态
         allotBillEntity.setAllotStatus(5);
-        BeanUtils.copyProperties(allotReceiveVo, allotBillEntity);
+        MapperUtils.copyNoNullProperties(allotReceiveVo, allotBillEntity);
         allotBillEntity.setReceiveTime(TimestampUtil.getCurrentTimestamp());
-        allotBillEntity.setReceiveUseraId(userId);
+        if (allotBillEntity.getReceiveUseraId()==null) {
+            allotBillEntity.setReceiveUseraId(userId);
+        }
         if (allotReceiveVo.getSendUserbId()!=null){
             allotBillEntity.setSendUserbId(allotReceiveVo.getSendUserbId());
             allotBillEntity.setAgent(userPublicService.getOne(allotReceiveVo.getSendUserbId()).getName());
@@ -423,7 +424,7 @@ public class AllotBillController {
             taskService.moveAllSonNodeToEnd(taskBto.getId());
         }
         else {
-            taskService.moveToNext(taskBto);
+            taskService.moveToSpecial(taskBto,StatusEnum.WAIT_UPLOAD_ALLOT_RECEIVE_FILE,0);
         }
         //生成上级上传单据任务
 //        List<Integer> userIds = new ArrayList();

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java

@@ -31,7 +31,6 @@ import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
@@ -206,9 +205,11 @@ public class BackController {
             allotBackBill.setRightSignatureId(allotBackReceiveVo.getRightSignatureId());
         }
         allotBackBill.setBackStatus(3);
-        BeanUtils.copyProperties(allotBackReceiveVo, allotBackBill);
+        MapperUtils.copyNoNullProperties(allotBackReceiveVo, allotBackBill);
         allotBackBill.setReceiveTime(TimestampUtil.getCurrentTimestamp());
-        allotBackBill.setReceiveUseraId(userId);
+        if (allotBackBill.getReceiveUseraId()==null) {
+            allotBackBill.setReceiveUseraId(userId);
+        }
         if (allotBackReceiveVo.getSendUserbId()!=null){
             allotBackBill.setSendUserbId(allotBackReceiveVo.getSendUserbId());
             allotBackBill.setAgent(userPublicService.getOne(allotBackReceiveVo.getSendUserbId()).getName());
@@ -222,7 +223,7 @@ public class BackController {
             taskService.moveAllSonNodeToEnd(taskBto.getId());
         }
         else {
-            taskService.moveToNext(taskBto);
+            taskService.moveToSpecial(taskBto,StatusEnum.WAIT_UPLOAD_ALLOT_BACK_FILE,0);
         }
         //分隔装备id信息
         String deviceIdDetail = allotBackReceiveVo.getReceiveCheckDetail();