Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -310,7 +310,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     private void doCloseKittingOrder(MesWorkOrder mesWorkOrder,String userName){
         String organizeCode = mesWorkOrder.getOrganizeCode();
         DdlPackBean pullOrderPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkOrderNo(),"mesWorkOrder",pullOrderPackBean);
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkOrderNo(),"workOrderNo",pullOrderPackBean);
         List<MesPullingOrderInfo> pullingOrderInfoList = pullingOrderInfoRepository.findByHqlWhere(pullOrderPackBean);
         if (pullingOrderInfoList != null && !pullingOrderInfoList.isEmpty()) {
             List<MesPullingOrderInfo> infoList = pullingOrderInfoList.stream().filter(item -> item.getPullOrderStatus() != MesExtEnumUtil.PULL_ORDER_STATUS.PULL_ORDER_STATUS_50.getValue()).collect(Collectors.toList());