Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r24431 -r24529 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 24431) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 24529) @@ -3948,6 +3948,15 @@ } } } + // 装配任务剩余数量 + JSONArray packingTaskArray = new JSONArray(); + for (PackingTask packingTask : packingTasks) { + JSONObject packingTaskObj = new JSONObject(); + packingTaskObj.put("taskId", packingTask.getId()); + packingTaskObj.put("unPackAmount", packingTask.getUnPackAmount()); + packingTaskArray.add(packingTaskObj); + } + json.put("packingTasks", packingTaskArray); }else{ batchLoadToVirtaulBasket = false;//器械包批量装入虚拟篮筐是否成功 batchLoadMsg = "装配任务id为空"; @@ -4569,6 +4578,7 @@ leftAmount -= unPackAmount; //待补充数量 if(waitSupplementTousseAmount == null || waitSupplementTousseAmount == 0){ + packingTask.setUnPackAmount(0); delete(packingTask,PackingTask.DELETE_CAUSE_AUTO); if(StringUtils.isNotBlank(packingTask.getBasketBarcode())){ map.put(packingTask.getBasketBarcode(), packingTask.getBasketBarcode());