修改

src/main/java/com/steerinfo/dil/controller/WmsInboundResultController.java

@@ -136,7 +136,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
         int batch=0;
         //此条件成了说明他提交之后、另外一个还没提交交
         if ((conditionMap!=null&&conditionMap.get("userName").toString().equals(userName)&&conditionMap.get("resultStatus").toString().equals("1"))){
-            return success("请勿重复提交");
+            return success("等待提交");
         }
 
         //此条件成了说明第二个人开始提交了
@@ -208,6 +208,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                         int status2= wmsInboundResultServiceImpl.updateInboundStatus(wmspInboundDistribute.getDistributeId());
                     }
                 }
+                int status3= wmspInboundDistributeService.updateDistributeStatus(wmspInboundDistribute.getDistributeId().toString());
 
             }
             return success("下发成功");

src/main/resources/com/steerinfo/dil/mapper/WmspInboundScanResultMapper.xml

@@ -1001,7 +1001,7 @@ where wisr.result_id = #{stackResultId}
         left join  WMSP_INBOUND_GROUP wig
         on wisr.inbound_Group_Id=wig.inbound_Group_Id
         where ((wig.USER_NAME_ONE ='${userName}' or wig.USER_NAME_TWO ='${userName}') and wig.state=1 and wisr.INSERT_USERNAME=#{userName}
-        and wisr.result_material=#{resultMaterial}) or wisr.RESULT_STATUS_=1
+        and wisr.result_material=#{resultMaterial} )
     </select>
     <!--查询已经扫描但是没有下发的-->
     <select id="noIssueScanResult" resultMap="BaseResultMap">