From f92e75d11fb60f7d7717848d8b91d0ab379c3333 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 21 Sep 2023 15:59:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/RemoteSapService.java | 2 +- .../plan/controller/ProOrderController.java | 21 +-- .../java/com/op/plan/domain/ProOrder.java | 3 + .../com/op/plan/mapper/ProOrderMapper.java | 2 + .../com/op/plan/service/IProOrderService.java | 7 - .../service/impl/ProOrderServiceImpl.java | 175 ++++++------------ .../impl/ProOrderWorkorderServiceImpl.java | 35 +++- .../resources/mapper/plan/ProOrderMapper.xml | 7 +- .../op/quality/controller/QuaController.java | 2 +- 9 files changed, 103 insertions(+), 151 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java index 79f89925..abf3eafd 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java @@ -35,7 +35,7 @@ public interface RemoteSapService { public R>materialPreparation(@RequestParam("shopOrder") String shopOrder); /**回传sap母工单**/ - @PostMapping("/sap/SapCreateOrder") + @PostMapping("/sap/sapCreateOrder") public R> SapCreateOrder(@RequestBody List sapCreateOrderList); /**关闭订单**/ diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java index a5a6dd1c..f6ac77c6 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; +import com.op.common.security.utils.SecurityUtils; import com.op.plan.domain.dto.SplitOrderDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -83,15 +84,19 @@ public class ProOrderController extends BaseController { List orderList = new ArrayList<>(); ProOrder example = new ProOrder(); example.setPlanFactoryCode("000000"); + example.setOrderType("LJ01"); example.setOrderCode("000000"); example.setProdCode("000000"); example.setProdDesc("物料名称样例"); example.setQuantity(100L); - example.setUnit("BP"); - example.setProdType("white"); + example.setUnit("KAR"); + example.setWorkerOrder("510000"); + example.setProdType("prod"); example.setStatus("o0"); + example.setParentOrder("1000000"); example.setPlanComplete(DateUtils.getNowDate()); example.setPlanProDate(DateUtils.getNowDate()); + example.setCreateBy(SecurityUtils.getUsername()); example.setCreateTime(DateUtils.getNowDate()); example.setUpdateTime(DateUtils.getNowDate()); orderList.add(example); @@ -218,18 +223,6 @@ public class ProOrderController extends BaseController { return toAjax(proOrderService.insertProOrder(proOrder)); } - /** - * SAP新增订单 - * - * @param proOrderList - * @return - */ - @Log(title = "同步SAP订单", businessType = BusinessType.INSERT) - @PostMapping("/shopOrderSync") - public void shopOrderSync(List proOrderList) { - proOrderService.shopOrderSync(proOrderList); - } - /** * 修改订单 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java index 9a7b387f..9a65e927 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java @@ -28,6 +28,7 @@ public class ProOrder extends TreeEntity { private String factoryCode; /** 订单类型 */ + @Excel(name = "订单类型") private String orderType; /** 订单号 */ @@ -55,6 +56,7 @@ public class ProOrder extends TreeEntity { private String unit; /** 任务清单 */ + @Excel(name = "任务清单") private String workerOrder; private String bomBo; @@ -99,6 +101,7 @@ public class ProOrder extends TreeEntity { private String status; /** 上级工单 */ + @Excel(name = "父级订单") private String parentOrder; public String getPlanFactoryCode() { diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java index 66c05323..3a90dbc5 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java @@ -116,6 +116,8 @@ public interface ProOrderMapper { */ List selectChildProOrderByCode(String orderCode); + List selectParentProOrderByCode(String parentOrder); + /** * 通过code获取产线名称 * diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java index dc466d2c..12864357 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java @@ -97,13 +97,6 @@ public interface IProOrderService { public AjaxResult getOrderList(String id); - /** - * SAP订单同步 - * @param proOrderList - */ - - void shopOrderSync(List proOrderList); - public AjaxResult syncSAP(); /** diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index 036d7000..c17a49c7 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -381,21 +381,6 @@ public class ProOrderServiceImpl implements IProOrderService { return success(proOrder); } - @Override - public void shopOrderSync(List proOrderList) { - - for (ProOrder proOrder : proOrderList) { - String shopOrder = proOrder.getOrderCode(); - if (StringUtil.isBlank(shopOrder)) { - throw new CheckedException("订单号不能为空！"); - } - if (StringUtil.isBlank(proOrder.getStatus())) { - throw new CheckedException("订单号不能为空！"); - } - - } - } - /** * 手动同步sap订单 */ @@ -424,47 +409,65 @@ public class ProOrderServiceImpl implements IProOrderService { } @Transactional(rollbackFor = Exception.class) - public void syncSAPFunc(List newOrders){ + public String syncSAPFunc(List newOrders){ + String failOrder = ""; ProOrder proOrder = null; for (SapProOrder sapProOrder:newOrders) { - //工单下达后整个订单就被锁定//订单存在就更新，不存在就插入 + //工单生产后整个订单就被锁定//订单存在就更新，不存在就插入 proOrder = new ProOrder(); BeanUtils.copyProperties(sapProOrder, proOrder); - //pro_order_workorder - Date nowDate = DateUtils.getNowDate(); - ProOrder orderExit = proOrderMapper.selectProOrderByOrderCode(proOrder.getOrderCode()); - if (orderExit==null) {//不存在就插入 - proOrder.setId(IdUtils.fastSimpleUUID()); - //proOrder.setCreateTime(nowDate); - proOrder.setCreateBy(SecurityUtils.getUsername()); - proOrderMapper.insertProOrder(proOrder); - } else {//存在，如果没活动更新，否则不允许更新，关闭订单 - proOrder.setId(orderExit.getId()); - proOrder.setQuantitySplit(0L); - ProOrderWorkorder owork = new ProOrderWorkorder(); - owork.setOrderCode(proOrder.getOrderCode()); - owork.setStatusArray("'w2','w3','w4'");//已派发w1未派w0活动w2报工w3暂停w4 - List workOrders = proOrderWorkorderMapper.selectProOrderWorkorderList(owork); - if (CollectionUtils.isEmpty(workOrders)) {//更新 - proOrder.setUpdateTime(nowDate); - proOrder.setUpdateBy(SecurityUtils.getUsername()); - //如果工单没下达，则更新pro_order - proOrderMapper.updateProOrder(proOrder); - List orderCodes = this.getListByPCode(proOrder); - if (!CollectionUtils.isEmpty(orderCodes)) { - List idstr = orderCodes.stream().map(order -> order.getId()).collect(Collectors.toList()); - String[] ids = idstr.stream().toArray(String[]::new); - //删除批次pro_order_workorder_batch - proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderIds(ids); - //删除工单pro_order_workorder - proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(ids); - } + failOrder += syncFunc(proOrder); + } + return failOrder; + } + @Transactional(rollbackFor = Exception.class) + public String syncImportFunc(List newOrders){ + String failOrder = ""; + for (ProOrder proOrder:newOrders) { + failOrder += syncFunc(proOrder); + } + return failOrder; + } + + public String syncFunc(ProOrder proOrder){ + String failOrder = ""; + //pro_order_workorder + Date nowDate = DateUtils.getNowDate(); + ProOrder orderExit = proOrderMapper.selectProOrderByOrderCode(proOrder.getOrderCode()); + if (orderExit==null) {//不存在就插入 + proOrder.setId(IdUtils.fastSimpleUUID()); + //proOrder.setCreateTime(nowDate); + proOrder.setCreateBy(SecurityUtils.getUsername()); + proOrderMapper.insertProOrder(proOrder); + } else {//存在，如果没活动更新，否则不允许更新，关闭订单 + proOrder.setId(orderExit.getId()); + proOrder.setQuantitySplit(0L); + ProOrderWorkorder owork = new ProOrderWorkorder(); + owork.setOrderCode(proOrder.getOrderCode()); + owork.setStatusArray("'w2','w3','w4'");//已派发w1未派w0活动w2报工w3暂停w4 + List workOrders = proOrderWorkorderMapper.selectProOrderWorkorderList(owork); + if (CollectionUtils.isEmpty(workOrders)) {//更新 + proOrder.setUpdateTime(nowDate); + proOrder.setUpdateBy(SecurityUtils.getUsername()); + //如果工单没下达，则更新pro_order + proOrderMapper.updateProOrder(proOrder); + List orderCodes = this.getListByPCode(proOrder); + if (!CollectionUtils.isEmpty(orderCodes)) { + List idstr = orderCodes.stream().map(order -> order.getId()).collect(Collectors.toList()); + String[] ids = idstr.stream().toArray(String[]::new); + //删除批次pro_order_workorder_batch + proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderIds(ids); + //删除工单pro_order_workorder + proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(ids); } + }else{ + failOrder = proOrder.getOrderCode(); + } // else {//关闭订单 // remoteSapService.sapCloseOrder(proOrder.getOrderCode()); // } - } } + return failOrder; } //父查子递归 @@ -478,6 +481,7 @@ public class ProOrderServiceImpl implements IProOrderService { return codeList; } + /** * 处理表格信息 * @@ -492,81 +496,8 @@ public class ProOrderServiceImpl implements IProOrderService { AjaxResult checkResult = checkImportOrder(orderList); // 如果数据校验成功 if (checkResult.isSuccess()) { - // 校验数据是否可编辑 - boolean checkEdit = false; - // 反馈数据 - StringBuilder errMsg = new StringBuilder(); - for (int i = 0; i < orderList.size(); i++) { - // 当前行操作 - boolean checkOnly = false; - - List workOrderList = proOrderWorkorderMapper.selectWorkOrderByOrderCode(orderList.get(i).getOrderCode()); - - // 遍历查询工单是否已下达-下达则不允许编辑更新 - for (ProOrderWorkorder workOrder : workOrderList) { - // 如果工单已生产 - if (!(workOrder.getStatus().equals("w0") || workOrder.getStatus().equals("w1"))) { - checkEdit = true; - checkOnly = true; - } - } - - // 组装工单已下达反馈信息 - if (checkOnly) { - errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已生产,不允许更新;" + "
"); - } - } - - // 如果存在不可编辑信息 - if (checkEdit) { - return error(500, errMsg.toString()); - } - - // 正常插入与更新操作 - for (ProOrder order : orderList) { - // 查询订单是否存在 - ProOrder proOrder = proOrderMapper.selectProOrderByOrderCode(order.getOrderCode()); - // 如果存在 - if (proOrder != null) { - // 通过订单Code查询该订单下的所有工单id-用于删除批次表 - List childWorkOrderList = proOrderWorkorderMapper.selectWorkOrderByOrderCode(proOrder.getOrderCode()); - // 存在工单 - if (childWorkOrderList.size() > 0){ - // 将获得的工单id封装 - List ids = new ArrayList<>(); - for (ProOrderWorkorder workOrder : childWorkOrderList) { - ids.add(workOrder.getWorkorderId()); - } - String[] workorderIds = (String[])ids.toArray(new String[ids.size()]); - - // 删除所有该订单下的工单 - proOrderWorkorderMapper.deleteProOrderWorkorderByOrderId(proOrder.getId()); - // 删除工单下的所有批次表信息 - proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderIds(workorderIds); - } - - // 更新字段 - order.setStatus("o0"); - order.setQuantitySplit(0L); - order.setUpdateBy(SecurityContextHolder.getUserName()); - order.setUpdateTime(DateUtils.getNowDate()); - // 通过订单号code更新订单信息 - proOrderMapper.updateProOrderByOrderCode(order); - } else { - // 创建字段 - order.setCreateBy(SecurityContextHolder.getUserName()); - // 更新字段 - order.setUpdateBy(SecurityContextHolder.getUserName()); - order.setUpdateTime(DateUtils.getNowDate()); - // 不存在则创建 - order.setId(IdUtils.fastSimpleUUID()); - order.setOrderType(order.getProdType()); - order.setParentOrder("0"); - proOrderMapper.insertProOrder(order); - } - } - - return success("信息导入成功"); + String info = syncImportFunc(orderList); + return success("信息导入完成。其中导入失败订单："+info); } // 校验失败 return checkResult; diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 80804f90..01e976ae 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; +import java.util.stream.Collectors; import static com.op.common.core.web.domain.AjaxResult.error; import static com.op.common.core.web.domain.AjaxResult.success; @@ -204,7 +205,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { @Transactional(rollbackFor = Exception.class) public int downProOrderWorkorderByWorkorderIds(String[] workorderIds) { List ids = new ArrayList<>(); - + List psorders = new ArrayList<>();//父级工单 List sapList = null;//回传给sap的工单 //如果是白坯生成备料单 for (String workorderId : workorderIds) { @@ -244,7 +245,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { }else{ //无湿料计划，下发不了 } - } else if (whiteOrder != null) {//成品的母工单回传sap + } else if (whiteOrder != null && !"white".equals(whiteOrder.getProdType())) {//成品的母工单回传sap sapList = new ArrayList<>(); SapCreateOrder sap = new SapCreateOrder(); sap.setWerks(whiteOrder.getFactoryCode());//工厂编码 @@ -280,8 +281,16 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { logger.info("sap工单回传sap虚拟工单号：" + sapCode); } + //子查父工单，都要工单状态改下发 + ProOrder pOrder = new ProOrder(); + pOrder.setParentOrder(workorderId); + List pordes = getListBySonCode(pOrder); + if(!CollectionUtils.isEmpty(pordes)){ + psorders.addAll(pordes); + } + + ids.add(workorderId); } - ids.add(workorderId); } } if(!CollectionUtils.isEmpty(ids)){ @@ -304,13 +313,29 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } } } - //下达工单 - return proOrderWorkorderMapper.downProOrderWorkorderByWorkorderIds(idsArray); + if(!CollectionUtils.isEmpty(psorders)){ + List pcodes = psorders.stream().map(e -> e.getOrderCode()).collect(Collectors.toList()); + ids.addAll(pcodes); + } + String[] idsArrayAll = (String[])ids.toArray(new String[ids.size()]); + //下达工单 + return proOrderWorkorderMapper.downProOrderWorkorderByWorkorderIds(idsArrayAll); } return 0; } + //子查父递归 + public List getListBySonCode(ProOrder pOrder) { + List codeList = new ArrayList<>(); + codeList.add(pOrder); + List parentOrder = proOrderMapper.selectParentProOrderByCode(pOrder.getParentOrder()); + if (!CollectionUtils.isEmpty(parentOrder)) { + getListBySonCode(parentOrder.get(0)); + } + return codeList; + } + // //获取最低级材料 // private void getLastChildren(List all, List allChildren , BaseBomComponentDTO bc) { // List cList = all.stream().filter(item -> item.getCumc().equals(bc.getComponent())) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml index 3de44404..0ea9a299 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml @@ -85,8 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where parent_order = #{orderCode} and del_flag = '0' + + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 87a62603..f0acbc2a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -40,7 +40,7 @@ public class QuaController extends BaseController { remoteMesService.requestDestinationStations(wcsdto); return R.ok(); } - return R.fail(); + return R.ok(); } /** From 905b9b426a5a8d6a189614a62a685988ca4d2c4c Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 21 Sep 2023 16:41:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5=20IP+port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseEquipment.java | 24 +++++++++++++++++++ .../mapper/wms/BaseEquipmentMapper.xml | 12 +++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index 4ff608de..f9d7c4fe 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -138,6 +138,28 @@ public class BaseEquipment extends BaseEntity { @Excel(name = "说明") private String explain; + /** IP */ + @Excel(name = "IP") + private String plcIp; + + /** 端口号 */ + @Excel(name = "端口号") + private String plcPort; + + public void setPlcIp(String plcIp) { + this.plcIp = plcIp; + } + public String getPlcIp() { + return plcIp; + } + + public void setPlcPort(String plcPort) { + this.plcPort = plcPort; + } + public String getPlcPort() { + return plcPort; + } + public void setExplain(String explain) { this.explain = explain; } @@ -396,6 +418,8 @@ public class BaseEquipment extends BaseEntity { .append("isOpen", getIsOpen()) .append("property", getProperty()) .append("explain", getExplain()) + .append("plcIp", getPlcIp()) + .append("plcPort", getPlcPort()) .toString(); } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index 2f126c6e..90d8f774 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -31,10 +31,12 @@ + + - select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price,unit_working_hours,del_flag from base_equipment + select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price,unit_working_hours,del_flag,plc_ip,plc_port from base_equipment @@ -96,6 +100,8 @@ workshop_section, equipment_location, hourly_unit_price, + plc_ip, + plc_port, #{equipmentCode}, @@ -122,6 +128,8 @@ #{workshopSection}, #{equipmentLocation}, #{hourlyUnitPrice}, + #{plcIp}, + #{plcPort}, @@ -152,6 +160,8 @@ workshop_section = #{workshopSection}, equipment_location = #{equipmentLocation}, hourly_unit_price = #{hourlyUnitPrice}, + plc_ip = #{plcIp}, + plc_port = #{plcPort}, where equipment_id = #{equipmentId} From 48e68cc67c18c66b2e0df084b01eb4cb661fc6d0 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 21 Sep 2023 16:46:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=20=E5=BF=BD=E7=95=A5=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml index dba89ef9..f8f26d4e 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml @@ -125,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select factory_code,factory_name from sys_factory where del_flag = '0' + and f_type = 'c'