Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -646,7 +646,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4));
                 break;
             case Constant.ORDER_STATUS_WAIT_AUDITED:
-                filterOrderRequest.setStatuses(Arrays.asList(10, 7));
+                filterOrderRequest.setStatuses(Arrays.asList(10));
                 filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
                 break;
             case Constant.ORDER_STATUS_UN_ALLOCATE:

src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml

@@ -96,6 +96,7 @@
                bp.zczbhhzbapzbh,
                bp.ylqxzcrbarmc,
                bp.nameCode,
+               bp.manufactory,
                ad.name        deptName,
                aw.name        invName,
                sp.name        invSpaceName
@@ -117,6 +118,7 @@
                 AND pd.invSpaceCode = #{invSpaceCode}
             </if>
         </where>
+        group by pd.code
     </select>
 
     <update id="batchBindSpace">

src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml

@@ -138,4 +138,4 @@
         WHERE id = #{id}
     </delete>
 
-</mapper>
+</mapper>