JIS

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

@@ -248,7 +248,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
         //查询拉动单主表是JIS拉动且拉动状态为10
         String append = packBean.getWhereAppend() +
                 " AND EXISTS (select 1 from MesPullingOrderInfo po where po.organizeCode = '"+ bean.getOrganizeCode() +"' and po.pullingOrderNo = model.pullingOrderNo" +
-                " and po.pullOrderType=20 and  po.workCenterCode ='" + bean.getWorkCenterCode() + "' ";
+                " and po.pullOrderType = 20 and po.pullOrderStatus != 50 and po.workCenterCode = '" + bean.getWorkCenterCode() + "' ";
         packBean.setWhereAppend(append + " )");
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"pullingOrderNo"}, packBean);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java

@@ -70,7 +70,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         resultMap.put(MesPcnExtConstWords.CUST_PART_NO, workOrder.getCustPartNo());
         // 客户条码
         resultMap.put(MesPcnExtConstWords.SN, workOrder.getCustSn());
-        // 车型名称
+        // 工单备注
         resultMap.put(MesPcnExtConstWords.REMARK, workOrder.getDescription());
         // 重打印
         resultMap.put(MesPcnExtConstWords.REPRINT, "");