Merge remote-tracking branch 'origin/master'

op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java

@@ -103,7 +103,7 @@ public class ProBPOrderWorkorderController extends BaseController {
     /**
      * 查询生产工单列表
      */
-    @RequiresPermissions("mes:bppro:proworkorder:list")
+    @RequiresPermissions("mes:bppro:workorder:list")
     @GetMapping("/list")
     public TableDataInfo list(ProOrderWorkorder proOrderWorkorder) {
         startPage();

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java

@@ -94,4 +94,6 @@ public interface QcCheckTaskIncomeMapper {
     int addQcCheckTaskDefects(@Param("list") List<QcCheckTaskDefect> defects);
 
 	List<QcCheckTaskDefect> getCkeckDefectList(QcCheckTaskDetail qcCheckTaskDetail);
+
+	List<QcCheckTaskDefect> getDefectType(QcCheckTaskDetail qcCheckTaskDetail);
 }

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

@@ -484,6 +484,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			defect.setCreateTime(nowTime);
 			defect.setCreateBy(updateBy);
 			defect.setFactoryCode(factoryCode);
+			defect.setBelongTo(belongId);
 			noOkQquality = noOkQquality.add(defect.getNoOkQuality());
 		}
 		qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数

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

@@ -1,5 +1,6 @@
 package com.op.quality.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.domain.BaseFileData;
@@ -126,6 +127,9 @@ public class QcProCheckServiceImpl implements QcProCheckService {
         List<QcCheckTaskDetail> qcCheckTaskDetails =qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
         dto.setQcCheckTaskDetails(qcCheckTaskDetails);
         List<QcCheckTaskDefect> defects =qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail);
+        if(CollectionUtils.isEmpty(defects)){
+            defects =qcCheckTaskIncomeMapper.getDefectType(qcCheckTaskDetail);
+        }
         dto.setDefects(defects);
         return dto;
     }

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

@@ -64,6 +64,7 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService {
 		wmsRawOrderIn.setActiveFlag("1");
 		wmsRawOrderIn.setSupplyCode("0000102874");
 		wmsRawOrderIn.setSapFactoryCode("1000");
+		wmsRawOrderIn.setQualityStatus("0");
 		return wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn);
 	}
 

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -322,12 +322,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getCkeckDefectList" resultType="com.op.quality.domain.QcCheckTaskDefect">
 		select
-			record_id recordId,
+			qctd.record_id recordId,
+			qctd.defect_code defectCode,
+			qctd.defect_subclass defectSubclass,
+			qctd.noOk_quality noOkQuality
+		from qc_check_task_defect qctd
+		where qctd.del_flag = '0' and qctd.belong_to = #{belongTo}
+		order by qctd.defect_code
+	</select>
+	<select id="getDefectType" resultType="com.op.quality.domain.QcCheckTaskDefect">
+		select
 			defect_code defectCode,
-			defect_subclass defectSubclass,
+			defect_subclass defectSubclass
-			noOk_quality noOkQuality
+		from qc_defect_type qdt
-		from qc_check_task_defect
+				 left join qc_check_type qct on qdt.defect_type = qct.type_code
-		where del_flag = '0' and belong_to = #{belongTo}
+		where qct.order_code = #{checkType} and qdt.del_flag = '0'
+		order by qdt.defect_code
 	</select>
 	<insert id="addCheckUsers">
 		insert into qc_check_task_user(

op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java

@@ -39,11 +39,23 @@ public class OdsProcureOutOrderController extends BaseController {
 	@RequiresPermissions("wms:outorder:list")
 	@GetMapping("/list")
 	public TableDataInfo list(OdsProcureOutOrder odsProcureOutOrder) {
-		startPage();
+//		startPage();
 		List<OdsProcureOutOrder> list = odsProcureOutOrderService.selectOdsProcureOutOrderList(odsProcureOutOrder);
 		return getDataTable(list);
 	}
 
+	@PostMapping("/listZU")
+	public TableDataInfo listZU(OdsProcureOutOrder odsProcureOutOrder) {
+		startPage();
+		List<OdsProcureOutOrder> list = odsProcureOutOrderService.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
+		for (OdsProcureOutOrder	odsProcureOutOrder1:
+				list) {
+			List<OdsProcureOutOrder>	orderList1=	odsProcureOutOrderService.selectOdsProcureOutOrderListZUTwo(odsProcureOutOrder1);
+			odsProcureOutOrder1.setList(orderList1);
+		}
+
+		return getDataTable(list);
+	}
 	/**
 	 * 导出包材出库单列表
 	 */

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java

@@ -97,8 +97,8 @@ public class WmsProductPut extends BaseEntity {
 	private String batchNumber;
 
 	/** 预留字段2 */
-	@Excel(name = "预留字段2")
+	@Excel(name = "生产日期")
-	private String attr2;
+	private String productDate;
 
 	/** 预留字段3 */
 	@Excel(name = "预留字段3")
@@ -272,13 +272,16 @@ public class WmsProductPut extends BaseEntity {
 	public String getBatchNumber() {
 		return batchNumber;
 	}
-	public void setAttr2(String attr2) {
+
-		this.attr2 = attr2;
+
+	public String getProductDate() {
+		return productDate;
 	}
 
-	public String getAttr2() {
+	public void setProductDate(String productDate) {
-		return attr2;
+		this.productDate = productDate;
 	}
+
 	public void setAttr3(String attr3) {
 		this.attr3 = attr3;
 	}
@@ -338,40 +341,36 @@ public class WmsProductPut extends BaseEntity {
 
 	@Override
 	public String toString() {
-		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+		return "WmsProductPut{" +
-			.append("id", getId())
+				"id='" + id + '\'' +
-			.append("workOrder", getWorkOrder())
+				", workOrder='" + workOrder + '\'' +
-			.append("factoryCode", getFactoryCode())
+				", factoryCode='" + factoryCode + '\'' +
-			.append("productOrder", getProductOrder())
+				", productOrder='" + productOrder + '\'' +
-			.append("whCode", getWhCode())
+				", whCode='" + whCode + '\'' +
-			.append("waCode", getWaCode())
+				", waCode='" + waCode + '\'' +
-			.append("wlCode", getWlCode())
+				", wlCode='" + wlCode + '\'' +
-			.append("productName", getProductName())
+				", productName='" + productName + '\'' +
-			.append("productCode", getProductCode())
+				", productCode='" + productCode + '\'' +
-			.append("productSort", getProductSort())
+				", productSort='" + productSort + '\'' +
-			.append("specification", getSpecification())
+				", specification='" + specification + '\'' +
-			.append("unitOfMeasure", getUnitOfMeasure())
+				", unitOfMeasure='" + unitOfMeasure + '\'' +
-			.append("planQuantity", getPlanQuantity())
+				", planQuantity=" + planQuantity +
-			.append("putQuantity", getPutQuantity())
+				", putQuantity=" + putQuantity +
-			.append("status", getStatus())
+				", status='" + status + '\'' +
-			.append("sapStatus", getSapStatus())
+				", sapStatus='" + sapStatus + '\'' +
-			.append("sapProof", getSapProof())
+				", sapProof='" + sapProof + '\'' +
-			.append("sapMessage", getSapMessage())
+				", sapMessage='" + sapMessage + '\'' +
-			.append("putDate", getPutDate())
+				", putDate=" + putDate +
-			.append("batchNumber", getBatchNumber())
+				", batchNumber='" + batchNumber + '\'' +
-			.append("attr2", getAttr2())
+				", product_date='" + productDate + '\'' +
-			.append("attr3", getAttr3())
+				", attr3='" + attr3 + '\'' +
-			.append("attr4", getAttr4())
+				", attr4='" + attr4 + '\'' +
-			.append("attr5", getAttr5())
+				", attr5='" + attr5 + '\'' +
-			.append("attr6", getAttr6())
+				", attr6='" + attr6 + '\'' +
-			.append("attr7", getAttr7())
+				", attr7='" + attr7 + '\'' +
-			.append("attr8", getAttr8())
+				", attr8='" + attr8 + '\'' +
-			.append("attr9", getAttr9())
+				", attr9='" + attr9 + '\'' +
-			.append("attr10", getAttr10())
+				", attr10='" + attr10 + '\'' +
-			.append("createBy", getCreateBy())
+				'}';
-			.append("createTime", getCreateTime())
-			.append("updateBy", getUpdateBy())
-			.append("updateTime", getUpdateTime())
-			.toString();
 	}
 }

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java

@@ -69,4 +69,8 @@ public interface OdsProcureOutOrderMapper {
 	void updateOdsProcureOutOrderByid(OdsProcureOutOrder odsProcureOutOrder);
 
 	List<OdsProcureOutOrder> selectOdsProcureOutOrderListByIds(@Param("list") List<OdsProcureOutOrder> orderList);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java

@@ -57,4 +57,8 @@ public interface IOdsProcureOutOrderService {
 	 * @return 结果
 	 */
 	public int deleteOdsProcureOutOrderByID(String ID);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUTwo(OdsProcureOutOrder odsProcureOutOrder1);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.op.wms.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -91,4 +92,16 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
 	public int deleteOdsProcureOutOrderByID(String ID) {
 		return odsProcureOutOrderMapper.deleteOdsProcureOutOrderByID(ID);
 	}
+
+	@Override
+	public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder) {
+
+		return odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
+	}
+
+	@Override
+	public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUTwo(OdsProcureOutOrder odsProcureOutOrder1) {
+		List<OdsProcureOutOrder>	orderList= odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUT(odsProcureOutOrder1);
+		return orderList;
+	}
 }

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -40,11 +40,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="enterpriseId"	column="Enterprise_Id"	/>
 		<result property="enterpriseCode"	column="Enterprise_Code"	/>
 	</resultMap>
-
+	<sql id="pagination_tail">
+		limit #{page.pageOffset} , #{page.rows}
+	</sql>
 	<sql id="selectOdsProcureOutOrderVo">
 		select Site_code, ID, Produce_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit,  COALESCE(Out_Number, 0) as Out_Number , Loc_Code, Loc_Desc, Production_Line_Desc, Production_Line_Code, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code from ods_procure_out_order
 	</sql>
-
+	<select id="selectOdsProcureOutOrderListZU" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
+		SELECT
+		Produce_Code,
+		User_Defined1
+		FROM
+		ods_procure_out_order
+		where
+		Active='1'
+		<if test="produceCode != null  and produceCode != ''"> and Produce_Code = #{produceCode}</if>
+		<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
+		GROUP BY	Produce_Code,User_Defined1
+	</select>
+	<select id="selectOdsProcureOutOrderListZUT" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
+		<include refid="selectOdsProcureOutOrderVo"/>
+		<where>
+			<if test="produceCode != null  and produceCode != ''"> and Produce_Code = #{produceCode}</if>
+			<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
+			<if test="Active != null  and Active != ''"> and Active = #{Active}</if>
+		</where>
+	</select>
 	<select id="selectOdsProcureOutOrderList" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 		<include refid="selectOdsProcureOutOrderVo"/>
 		<where>
@@ -294,4 +315,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{item.ID}
 		</foreach>
 	</select>
+
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="sapMessage"	column="SAP_message"	/>
 		<result property="putDate"	column="put_date"	/>
 		<result property="batchNumber"	column="batch_number"	/>
-		<result property="attr2"	column="attr2"	/>
+		<result property="productDate"	column="product_date"	/>
 		<result property="attr3"	column="attr3"	/>
 		<result property="attr4"	column="attr4"	/>
 		<result property="attr5"	column="attr5"	/>
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectWmsProductPutVo">
-		select id, work_order, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, batch_number, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put
+		select id, work_order, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, batch_number, product_date, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put
 	</sql>
 
 	<select id="selectWmsProductPutList" parameterType="WmsProductPut" resultMap="WmsProductPutResult">
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="sapMessage != null  and sapMessage != ''"> and SAP_message = #{sapMessage}</if>
 			<if test="putDate != null "> and put_date = #{putDate}</if>
 			<if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
-			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
+			<if test="productDate != null  and productDate != ''"> and product_date = #{productDate}</if>
 			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
 			<if test="attr4 != null  and attr4 != ''"> and attr4 = #{attr4}</if>
 			<if test="attr5 != null  and attr5 != ''"> and attr5 = #{attr5}</if>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectWmsProductPutByWorkOrder" resultMap="WmsProductPutResult">
 		SELECT
 		    factory_code,product_order,wh_code,wa_code,wl_code,product_name,product_code,product_sort,specification,
-		    unit_of_measure,plan_quantity,put_quantity,status,SAP_status,SAP_proof,SAP_message,put_date,batch_number,attr2,
+		    unit_of_measure,plan_quantity,put_quantity,status,SAP_status,SAP_proof,SAP_message,put_date,batch_number,product_date,
 		    attr3,attr4,attr5,attr6,attr7,attr8,attr9,attr10,create_by,create_time,
 		    update_by,update_time,id
 		FROM
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="sapMessage != null">SAP_message,</if>
 			<if test="putDate != null">put_date,</if>
 			<if test="batchNumber != null">batch_number,</if>
-			<if test="attr2 != null">attr2,</if>
+			<if test="productDate != null">product_date,</if>
 			<if test="attr3 != null">attr3,</if>
 			<if test="attr4 != null">attr4,</if>
 			<if test="attr5 != null">attr5,</if>
@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="sapMessage != null">#{sapMessage},</if>
 			<if test="putDate != null">#{putDate},</if>
 			<if test="batchNumber != null">#{batch_number},</if>
-			<if test="attr2 != null">#{attr2},</if>
+			<if test="productDate != null">#{product_date},</if>
 			<if test="attr3 != null">#{attr3},</if>
 			<if test="attr4 != null">#{attr4},</if>
 			<if test="attr5 != null">#{attr5},</if>
@@ -191,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="sapMessage != null">SAP_message = #{sapMessage},</if>
 			<if test="putDate != null">put_date = #{putDate},</if>
 			<if test="batchNumber != null">batch_number = #{batchNumber},</if>
-			<if test="attr2 != null">attr2 = #{attr2},</if>
+			<if test="productDate != null">product_date = #{productDate},</if>
 			<if test="attr3 != null">attr3 = #{attr3},</if>
 			<if test="attr4 != null">attr4 = #{attr4},</if>
 			<if test="attr5 != null">attr5 = #{attr5},</if>