库存检验

op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java

@@ -1,5 +1,6 @@
 package com.op.open.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
 import com.op.common.core.domain.R;

op-modules/op-open/src/main/java/com/op/open/service/OpenService.java

@@ -1,13 +1,10 @@
 package com.op.open.service;
 
-import com.op.common.core.domain.R;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.system.api.domain.device.EquRepairOrderDTO;
 import com.op.system.api.domain.dto.WCSDTO;
 import com.op.system.api.domain.dto.WechartDTO;
 import com.op.system.api.domain.mes.BaseProductDTO;
-import com.op.system.api.domain.mes.MesReportWorkDTO;
-import com.op.system.api.domain.quality.QcCheckTaskDTO;
 import com.op.system.api.domain.quality.QcCheckTaskProduceDTO;
 
 import java.util.List;

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -37,10 +37,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java

@@ -5,11 +5,14 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
+import com.op.common.core.utils.StringUtils;
+import com.op.quality.domain.OACheckTaskDTO;
 import com.op.quality.domain.QcCheckTaskIncome;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -141,4 +144,17 @@ public class QcCheckTaskInventoryController extends BaseController {
         qcCheckTaskInventoryService.createCCTask();
         return R.ok();
     }
+
+    //给oa提供的发起库存检验接口
+    @PostMapping("/createCCTaskFromOA")
+    public AjaxResult createCCTaskFromOA(@RequestBody OACheckTaskDTO dto) {
+        logger.info("oa发起库存检验参数"+ JSONObject.toJSONString(dto));
+        if(StringUtils.isBlank(dto.getFactoryCode())){
+            error("[factoryCode is null]");
+        }
+        if(CollectionUtils.isEmpty(dto.getDetail())){
+            error("[detail is null]");
+        }
+        return qcCheckTaskInventoryService.createCCTaskFromOA(dto);
+    }
 }

op-modules/op-quality/src/main/java/com/op/quality/domain/OACheckTaskDTO.java

@@ -0,0 +1,104 @@
+package com.op.quality.domain;
+
+import com.op.common.core.web.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * oa 发起库存检验
+ *
+ * @author Open Platform
+ * @date 2023-10-31
+ */
+public class OACheckTaskDTO extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+	//申请单号
+	private String applNo;
+	/**
+	 * 检测人工号
+	 */
+	private String checkManCode;
+	/**
+	 * 检测人姓名
+	 */
+	private String checkManName;
+	/**
+	 * QC主管工号
+	 **/
+	private String qcMgr;
+	/**
+	 * 质量主管工号
+	 **/
+	private String zlMgr;
+
+	private String factoryCode;
+
+	private int taskNum;
+
+	public int getTaskNum() {
+		return taskNum;
+	}
+
+	public void setTaskNum(int taskNum) {
+		this.taskNum = taskNum;
+	}
+
+	//任务明细
+	private List<QcCheckTaskInventory> detail;
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getApplNo() {
+		return applNo;
+	}
+
+	public void setApplNo(String applNo) {
+		this.applNo = applNo;
+	}
+
+	public String getCheckManCode() {
+		return checkManCode;
+	}
+
+	public void setCheckManCode(String checkManCode) {
+		this.checkManCode = checkManCode;
+	}
+
+	public String getCheckManName() {
+		return checkManName;
+	}
+
+	public void setCheckManName(String checkManName) {
+		this.checkManName = checkManName;
+	}
+
+	public String getQcMgr() {
+		return qcMgr;
+	}
+
+	public void setQcMgr(String qcMgr) {
+		this.qcMgr = qcMgr;
+	}
+
+	public String getZlMgr() {
+		return zlMgr;
+	}
+
+	public void setZlMgr(String zlMgr) {
+		this.zlMgr = zlMgr;
+	}
+
+	public List<QcCheckTaskInventory> getDetail() {
+		return detail;
+	}
+
+	public void setDetail(List<QcCheckTaskInventory> detail) {
+		this.detail = detail;
+	}
+}

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskInventoryService.java

@@ -3,6 +3,7 @@ package com.op.quality.service;
 import java.util.List;
 
 import com.op.common.core.web.domain.AjaxResult;
+import com.op.quality.domain.OACheckTaskDTO;
 import com.op.quality.domain.QcCheckTaskIncome;
 import com.op.quality.domain.QcCheckTaskInventory;
 
@@ -64,4 +65,6 @@ public interface IQcCheckTaskInventoryService {
     List<QcCheckTaskIncome> getPutInOrder(QcCheckTaskInventory qcCheckTaskInventory);
 
     AjaxResult createCCTask();
+
+    AjaxResult createCCTaskFromOA(OACheckTaskDTO dto);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java

@@ -49,4 +49,6 @@ public interface IQcStaticTableService {
     QcStaticTable getDLTableCPKInfo(QcStaticTable qcStaticTable);
 
     List<QcStaticTable> getProjectList(String checkType);
+
+    QcStaticTable getTableHzTitle(QcStaticTable qcStaticTable);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java

@@ -28,8 +28,6 @@ import com.op.system.api.RemoteUserService;
 import com.op.system.api.domain.SysNoticeGroup;
 import com.op.system.api.domain.SysUser;
 import com.op.system.api.domain.dto.WechartDTO;
-import com.op.system.api.domain.mes.ProOrderWorkorderDTO;
-import com.op.system.api.domain.quality.QcUserMaterialDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -386,6 +384,20 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
         return success();
     }
 
+    @Override
+    public AjaxResult createCCTaskFromOA(OACheckTaskDTO dto) {
+        List<QcCheckTaskInventory> dtos = dto.getDetail();
+        int m=0;
+        for(QcCheckTaskInventory ccTask:dtos){
+            ccTask.setAttr1(dto.getApplNo());//申请编码
+            ccTask.setCheckType("checkTypeCC");//库存检验
+            ccTask.setFactoryCode(dto.getFactoryCode());
+            m += insertQcCheckTaskInventory(ccTask);
+        }
+        logger.info("++++++++++++oa发起仓库检验任务生成" + m + "++++++++++++++");
+        return success();
+    }
+
     public void createCCFunc(String poolName){
         DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
         QcCheckTaskInventory qoPutIn = new QcCheckTaskInventory();