diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java
index 80bcf72e2..b3ec5c639 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java
@@ -140,7 +140,7 @@ public class QcInterfaceController {
}
/**
- * 过程检验-产品不合格率同期对比
+ * 成品抽检检验-产品不合格率同期对比
*
* @param qcInterface
* @return
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml
index 18a1dfc76..89f08dedc 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml
@@ -103,7 +103,7 @@
from qc_check_task qct
left join qc_check_task_defect qctd on qctd.belong_to = qct.record_id
left join qc_defect_type_class qdtc on qctd.class_id = qdtc.id
- where qct.check_type = 'checkTypeSCXJ' and qct.check_status = '2'
+ where qct.check_type = 'checkTypeCPPC' and qct.check_status = '2'
and (
CONVERT(varchar(10),qct.create_time, 120) >= SUBSTRING(#{productDateStart},0,11)
and
@@ -219,6 +219,9 @@
from qc_check_task qct
where qct.type_code = #{typeCode}
and qct.del_flag='0'
+
+ AND check_type = #{checkType}
+
and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
@@ -274,7 +277,7 @@
qct.sample_quality quality,
qct.noOk_quality
from qc_check_task qct
- where qct.check_type = 'checkTypeSCXJ'
+ where qct.check_type = 'checkTypeCPPC'
and qct.del_flag='0'
and CONVERT(varchar(4),qct.income_time, 120) in (${ymd})
) t
@@ -348,8 +351,7 @@
left join qc_check_type qc on qc.order_code = qct.check_type and qc.del_flag = '0'
left join qc_defect_type_class qdtc on qdtc.id = qct.remark_code
left join qc_defect_type qdt on qdt.defect_id = qdtc.defect_id
- where qct.type_code = #{typeCode} and qctd.status = 'N'
-
+ where qct.check_type IN ('checkTypeCPPC','checkTypeCPCJ','checkTypeCP','checkTypeSC','checkTypeLL') and qctd.status = 'N'
and (
CONVERT(varchar(10),qct.income_time, 120) >= SUBSTRING(#{productDateStart},0,11)
and
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
index 65e5fece7..069dba2cb 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
@@ -287,7 +287,7 @@
)
- and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+ and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -3, GETDATE()), 120))
and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120))
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomComponentMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomComponentMapper.java
index c1f7d0c3f..ef8d02475 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomComponentMapper.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomComponentMapper.java
@@ -2,6 +2,8 @@ package com.op.sap.mapper;
import com.op.system.api.domain.sap.SapBomComponent;
+import java.util.List;
+
/**
* 物料BOM子表Mapper接口
*
@@ -20,4 +22,7 @@ public interface SapBomComponentMapper {
public int insertSapBomComponent(SapBomComponent sapBomComponent);
+ public int deleteSapBomComponentByBomCode(String bomCode);
+
+
}
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java
index cbd1d92ed..cedc17157 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java
@@ -13,7 +13,7 @@ public interface SapBomMapper {
/**
* 新增BOM物料管理
*/
- List selectBaseBomByBomCode(String bomCode);
+ SapBom selectBaseBomByBomCode(String bomCode);
public int insertBaseBom(SapBom sapBom);
@@ -52,4 +52,6 @@ public interface SapBomMapper {
Date getRouteMaxTime();
Date getBomMaxTime();
+
+ int updateBaseBom(SapBom sapBom);
}
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java
index 7d4ff7522..256a4455e 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java
@@ -8,5 +8,4 @@ import com.op.system.api.domain.sap.SapBom;
public interface SapBomService {
public R bomSync(SapBomQuery sapBomQuery);
- SapBom getMaxRevisionBom(String STLNR);
}
diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml
index cb5d310b2..4064b35fc 100644
--- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml
+++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml
@@ -70,7 +70,6 @@
insert into base_bom_component
- id,
bom_bo,
bom_code,
site,
@@ -97,7 +96,6 @@
remark,
- #{id},
#{bomBo},
#{bomCode},
#{site},
@@ -165,4 +163,7 @@
#{id}
+
+ delete from base_bom_component where bom_code = #{bomCode}
+
diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml
index 518bb7a3e..21db629f8 100644
--- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml
+++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml
@@ -70,7 +70,6 @@
insert into base_bom
-
- bom_bo,
- factory_code,
- production_version,
- bom_code,
- optional_bom,
- optional_bom_text,
- pvvd,
- pved,
- bom_calculate_number,
- bom_calculate_unit,
- bom_base_number,
- bom_base_unit,
- component_unit,
- component_pro_flag,
- msi,
- sanka,
- attr1,
- attr2,
- attr3,
- create_by,
- create_time,
- update_by,
- update_time,
- remark,
- current_version,
-
+ ([factory_code], [production_version], [bom_code], [optional_bom], [pvvd], [pved],
+ [bom_calculate_number], [bom_calculate_unit], [bom_base_number], [bom_base_unit],
+ [component_pro_flag], [create_by], [create_time], [update_by],
+ [update_time])
VALUES
-
- #{bomBo},
- #{factoryCode},
- #{productionVersion},
- #{bomCode},
- #{optionalBom},
- #{optionalBomText},
- #{pvvd},
- #{pved},
- #{bomCalculateNumber},
- #{bomCalculateUnit},
- #{bomBaseNumber},
- #{bomBaseUnit},
- #{componentUnit},
- #{componentProFlag},
- #{msi},
- #{sanka},
- #{attr1},
- #{attr2},
- #{attr3},
- #{createBy},
- #{createTime},
- #{updateBy},
- #{updateTime},
- #{remark},
- #{currentVersion},
+
+
+ #{item.bomBo},
+ #{item.factoryCode},
+ #{item.productionVersion},
+ #{item.bomCode},
+ #{item.optionalBom},
+ #{item.optionalBomText},
+ #{item.pvvd},
+ #{item.pved},
+ #{item.bomCalculateNumber},
+ #{item.bomCalculateUnit},
+ #{item.bomBaseNumber},
+ #{item.bomBaseUnit},
+ #{item.componentUnit},
+ #{item.componentProFlag},
+ #{item.msi},
+ #{item.sanka},
+ #{item.attr1},
+ #{item.attr2},
+ #{item.attr3},
+ #{item.createBy},
+ #{item.createTime},
+ #{item.updateBy},
+ #{item.updateTime},
+ #{item.remark},
+ #{item.currentVersion},
+
@@ -231,7 +209,7 @@
remark = #{remark},
current_version = #{currentVersion},
- where factory_code = #{factoryCode}
+ where bom_bo = #{bomBo}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomComponentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomComponentController.java
index 013d6e058..33be04134 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomComponentController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomComponentController.java
@@ -44,7 +44,12 @@ public class BaseBomComponentController extends BaseController {
List list = baseBomComponentService.selectBaseBomComponentList(baseBomComponent);
return getDataTable(list);
}
-
+ @RequiresPermissions("wms:bomComponent:list")
+ @GetMapping("/getBomList")
+ public List getBomList(BaseBomComponent baseBomComponent) {
+ List list = baseBomComponentService.selectBaseBomComponentList(baseBomComponent);
+ return list;
+ }
/**
* 导出物料BOM子表列表
*/
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomController.java
index c05f9dc51..a89f0149e 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomController.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.op.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +36,16 @@ public class BaseBomController extends BaseController {
@Autowired
private IBaseBomService baseBomService;
+// /**
+// * 查询BOM物料管理列表
+// */
+// @RequiresPermissions("wms:bom:list")
+// @GetMapping("/list")
+// public TableDataInfo list(BaseBom baseBom) {
+// startPage();
+// List baseBoms = baseBomService.selectBaseBomList(baseBom);
+// return getDataTable(baseBoms);
+// }
/**
* 查询BOM物料管理列表
*/
@@ -45,7 +56,6 @@ public class BaseBomController extends BaseController {
List baseBoms = baseBomService.selectBaseBomList(baseBom);
return getDataTable(baseBoms);
}
-
/**
* 导出BOM物料管理列表
*/
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBom.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBom.java
index e5033e951..80a338fe5 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBom.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBom.java
@@ -1,6 +1,8 @@
package com.op.wms.domain;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomComponent.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomComponent.java
index 38e1aca56..159f5dc89 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomComponent.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomComponent.java
@@ -1,5 +1,6 @@
package com.op.wms.domain;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -41,6 +42,8 @@ public class BaseBomComponent extends BaseEntity {
@Excel(name = "物料编码")
private String productCode;
+ private String productDescZh;
+
/**
* 组件上层物料编码
*/
@@ -131,6 +134,24 @@ public class BaseBomComponent extends BaseEntity {
@Excel(name = "预留字段3")
private String attr3;
+ private BigDecimal totalStorage;
+
+ public BigDecimal getTotalStorage() {
+ return totalStorage;
+ }
+
+ public void setTotalStorage(BigDecimal totalStorage) {
+ this.totalStorage = totalStorage;
+ }
+
+ public String getProductDescZh() {
+ return productDescZh;
+ }
+
+ public void setProductDescZh(String productDescZh) {
+ this.productDescZh = productDescZh;
+ }
+
private List children;
public List getChildren() {
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomMapper.java
index 61d356d32..980cbc990 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomMapper.java
@@ -25,7 +25,7 @@ public interface BaseBomMapper {
* @param baseBom BOM物料管理
* @return BOM物料管理集合
*/
- public List selectBaseBomList0(BaseBom baseBom);
+ public List selectBaseBomList(BaseBom baseBom);
public List selectBaseBomList1(BaseBom baseBom);
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomComponentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomComponentServiceImpl.java
index 4c6c06be2..4de2c7acf 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomComponentServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomComponentServiceImpl.java
@@ -88,22 +88,8 @@ public class BaseBomComponentServiceImpl implements IBaseBomComponentService {
@Override
@DS("#header.poolName")
public List selectBaseBomComponentList(BaseBomComponent baseBomComponent) {
- List trees = new ArrayList<>();//新创建
List baseBomComponentList = baseBomComponentMapper.selectBaseBomComponentList(baseBomComponent);//查询baseBomComponent
- List filterBaseBomComponentList = baseBomComponentMapper.selectBomCodeList(baseBomComponent);//查询BomCodeList
- List filterCumcList = baseBomComponentMapper.selectProductCodeList(baseBomComponent);//查询BomCodeList
- //查询cumc 是否存在于product_code
- for (BaseBomComponent tree : baseBomComponentList) {
- //找出父节点
- boolean bool1 = filterBaseBomComponentList.contains(tree.getBomCode());//查询父节点是否在bom表中
- boolean bool2 = filterCumcList.contains(tree.getCumc());//查询节点是否是父节点
-// if (bool1 && bool2) {
- if (bool1) {
- // 调用递归方法填充子节点列表
- trees.add(findChildren(tree, baseBomComponentList));//找到孩子节点
- }
- }
- return trees;
+ return baseBomComponentList;
}
/**
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomServiceImpl.java
index 3c206e1d2..e77edbdbc 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
+import com.op.system.api.domain.SysUser;
import com.op.wms.mapper.BaseBomComponentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -46,50 +47,55 @@ public class BaseBomServiceImpl implements IBaseBomService {
@Override
@DS("#header.poolName")
public List selectBaseBomList(BaseBom baseBom) {
+ // 管理员显示所有菜单信息
+
+ List bomList= baseBomMapper.selectBaseBomList(baseBom);
+ return bomList;
+ }
//bom表
//主表 第0层
- if (baseBom.getBomHierarchy().equals("0")) {
- List list = baseBomMapper.selectBaseBomList0(baseBom);
- //判断 是否有HasChildren
- for (BaseBom baseBom1 : list) {
- if (baseBom1.getNumber() > 1) {
- baseBom1.setHasChildren(Boolean.TRUE);
- } else {
- baseBom1.setHasChildren(Boolean.FALSE);
- }
- }
- return list;
- } else if (baseBom.getBomHierarchy().equals("1")) {
- List list = baseBomMapper.selectBaseBomList1(baseBom);
- for (BaseBom baseBom1 : list) {
- if (baseBom1.getHandle() == null) {
- baseBom1.setHandle(IdUtils.fastSimpleUUID());
- }
- Integer childNodes = baseBomMapper.selectChildNodes(baseBom1);
- if (childNodes > 0) {
- baseBom1.setHasChildren(Boolean.TRUE);
- } else {
- baseBom1.setHasChildren(Boolean.FALSE);
- }
- }
- return list;
- } else {
- //2层以及以上 多条list
- List list = baseBomMapper.selectBaseBomList2(baseBom);
- for (BaseBom baseBom1 : list) {
- if (baseBom1.getHandle() == null) {
- baseBom1.setHandle(IdUtils.fastSimpleUUID());
- }
- Integer childNodes = baseBomMapper.selectChildNodes(baseBom1);
- if (childNodes > 0) {
- baseBom1.setHasChildren(Boolean.TRUE);
- } else {
- baseBom1.setHasChildren(Boolean.FALSE);
- }
- }
- return list;
- }
- }
+// if (baseBom.getBomHierarchy().equals("0")) {
+// List list = baseBomMapper.selectBaseBomList0(baseBom);
+// //判断 是否有HasChildren
+// for (BaseBom baseBom1 : list) {
+// if (baseBom1.getNumber() > 1) {
+// baseBom1.setHasChildren(Boolean.TRUE);
+// } else {
+// baseBom1.setHasChildren(Boolean.FALSE);
+// }
+// }
+// return list;
+// } else if (baseBom.getBomHierarchy().equals("1")) {
+// List list = baseBomMapper.selectBaseBomList1(baseBom);
+// for (BaseBom baseBom1 : list) {
+// if (baseBom1.getHandle() == null) {
+// baseBom1.setHandle(IdUtils.fastSimpleUUID());
+// }
+// Integer childNodes = baseBomMapper.selectChildNodes(baseBom1);
+// if (childNodes > 0) {
+// baseBom1.setHasChildren(Boolean.TRUE);
+// } else {
+// baseBom1.setHasChildren(Boolean.FALSE);
+// }
+// }
+// return list;
+// } else {
+// //2层以及以上 多条list
+// List list = baseBomMapper.selectBaseBomList2(baseBom);
+// for (BaseBom baseBom1 : list) {
+// if (baseBom1.getHandle() == null) {
+// baseBom1.setHandle(IdUtils.fastSimpleUUID());
+// }
+// Integer childNodes = baseBomMapper.selectChildNodes(baseBom1);
+// if (childNodes > 0) {
+// baseBom1.setHasChildren(Boolean.TRUE);
+// } else {
+// baseBom1.setHasChildren(Boolean.FALSE);
+// }
+// }
+// return list;
+// }
+// }
/**
* 新增BOM物料管理
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomComponentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomComponentMapper.xml
index e1aa0de11..c5ac1f25e 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomComponentMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomComponentMapper.xml
@@ -9,6 +9,7 @@
+
@@ -29,18 +30,56 @@
+
+
+
- select handle, bom_code, site, product_code, cumc, component, bom_hierarchy, project_no, standard_dosage, loss_rate, loss_amount, cilosses, component_unit, component_pro_flag, msi, sanka, attr1, attr2, attr3, create_by, create_time, update_by, update_time, remark from base_bom_component
-
+
+ SELECT
+ bbc.handle,
+ bbc.bom_code,
+ bbc.site,
+ bbc.product_code,
+ bp.product_desc_zh,
+ bbc.cumc,
+ bbc.component,
+ bbc.bom_hierarchy,
+ bbc.project_no,
+ bbc.standard_dosage,
+ bbc.loss_rate,
+ bbc.loss_amount,
+ bbc.cilosses,
+ bbc.component_unit,
+ bbc.component_pro_flag,
+ bbc.msi,
+ bbc.sanka,
+ bbc.attr1,
+ bbc.attr2,
+ bbc.attr3,
+ bbc.create_by,
+ bbc.create_time,
+ bbc.update_by,
+ bbc.update_time,
+ bbc.remark,
+ COALESCE(T.SUM_CLABS, 0) AS total_storage
+ FROM
+ base_bom_component bbc
+ LEFT JOIN
+ base_product bp ON bbc.component = RIGHT(bp.product_code, 11)
+ LEFT JOIN
+ (SELECT MATNR, SUM(CLABS) AS SUM_CLABS FROM sap_ods_mate_storage_news GROUP BY MATNR) T
+ ON
+ bp.product_code = T.MATNR
+