Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java

@@ -181,12 +181,10 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
         if (!StringUtil.isEmpty(bean.getPullCode())) {
             DdlPreparedPack.getInPackList(Arrays.asList(bean.getPullCode().split(",")), "pullCode", packBean);
         }
-        if (!StringUtil.isEmpty(bean.getWorkCenterCode())) {
-            DdlPreparedPack.getInPackList(Arrays.asList(bean.getWorkCenterCode().split(",")), "workCenterCode", packBean);
-        }
         //查询拉动单主表是JIS拉动且拉动状态为10
         String append = packBean.getWhereAppend() +
-                " AND EXISTS (select 1 from MesPullingOrderInfo po where po.pullingOrderNo = model.pullingOrderNo and po.pullOrderType=20 and po.pullOrderStatus =10  " ;
+                " AND EXISTS (select 1 from MesPullingOrderInfo po where po.pullingOrderNo = model.pullingOrderNo" +
+                " and po.pullOrderType=20 and po.pullOrderStatus =10 and po.workCenterCode ='"+bean.getWorkCenterCode()+"' " ;
         packBean.setWhereAppend(append+ " )");
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"status", "createDatetime"}, packBean);