Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java

@@ -114,6 +114,28 @@ public class EquSpareApply extends BaseEntity {
 	@Excel(name = "物料描述")
 	private String materialDesc;
 
+	/** 单价 */
+	@Excel(name = "单价")
+	private BigDecimal unitPrice;
+
+	/** 总价 */
+	@Excel(name = "总价")
+	private BigDecimal totalPrice;
+
+	public void setUnitPrice(BigDecimal unitPrice) {
+		this.unitPrice = unitPrice;
+	}
+	public BigDecimal getUnitPrice() {
+		return unitPrice;
+	}
+
+	public void setTotalPrice(BigDecimal totalPrice) {
+		this.totalPrice = totalPrice;
+	}
+	public BigDecimal getTotalPrice() {
+		return totalPrice;
+	}
+
 	public void setMaterialCode(String materialCode) {
 		this.materialCode = materialCode;
 	}

op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java

@@ -782,6 +782,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
                     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                     String key = "#header.poolName";
                     //工厂号
+                    //备件费用？？？？？
                     equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
                     equSpareApplyMapper.insertEquSpareApply(equSpareApply);
 
@@ -832,9 +833,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             EquRepairWorkOrder example = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId());
 
             // 费用
-            BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode());
-            BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost()));
-            equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost)));
+//            BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode());
+//            BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost()));
+//            equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost)));
 
             //修改设备状态 由维修中改为正常运行
             EquEquipment equEquipment = new EquEquipment();

op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java

@@ -95,6 +95,8 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
 					String code = applyList.getWorkCode();
 					applyList.setApplyCode("AW" + code.substring(2) + serialNum);
 				}
+				//总价
+//				applyList.setTotalPrice(applyList.getAmount().multiply(applyList.getUnitPrice()));
 				//领用时间
 				applyList.setApplyTime(DateUtils.getNowDate());
 				//申领人

op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml

@@ -28,10 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"	column="update_by"	/>
 		<result property="updateTime"	column="update_time"	/>
 		<result property="factoryCode"	column="factory_code"	/>
+		<result property="unitPrice"	column="unit_price"	/>
+		<result property="totalPrice"	column="total_price"	/>
 	</resultMap>
 
 	<sql id="selectEquSpareApplyVo">
-		select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_spare_apply
+		select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code , unit_price , total_price from equ_spare_apply
 	</sql>
 
 	<select id="selectEquSpareApplyList" parameterType="EquSpareApply" resultMap="EquSpareApplyResult">
@@ -55,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
 			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<if test="unitPrice != null  and unitPrice != ''"> and unit_price = #{unitPrice}</if>
+			<if test="totalPrice != null  and totalPrice != ''"> and total_price = #{totalPrice}</if>
 			and del_flag = '0'
 			ORDER BY apply_time DESC
 		</where>
@@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">update_by,</if>
 			<if test="updateTime != null">update_time,</if>
 			<if test="factoryCode != null">factory_code,</if>
+			<if test="unitPrice != null">unit_price,</if>
+			<if test="totalPrice != null">total_price,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="applyId != null">#{applyId},</if>
@@ -117,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">#{updateBy},</if>
 			<if test="updateTime != null">#{updateTime},</if>
 			<if test="factoryCode != null">#{factoryCode},</if>
+			<if test="unitPrice != null">#{unitPrice},</if>
+			<if test="totalPrice != null">#{totalPrice},</if>
 		 </trim>
 	</insert>
 
@@ -145,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">update_by = #{updateBy},</if>
 			<if test="updateTime != null">update_time = #{updateTime},</if>
 			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
+			<if test="unitPrice != null">unit_price = #{unitPrice},</if>
+			<if test="totalPrice != null">total_price = #{totalPrice},</if>
 		</trim>
 		where apply_id = #{applyId}
 	</update>
@@ -210,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getSparePartsCost" resultType="java.math.BigDecimal">
 		select SUM(a.spare_quantity * w.unit_price)
 		from equ_spare_apply a
-				 left join wms_ods_mate_storage_news_attached w on a.spare_code = w.primary_code
+		left join wms_ods_mate_storage_news_attached w on a.spare_code = w.primary_code
 		where a.work_code = #{orderCode}
 	</select>
 

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

@@ -88,9 +88,7 @@ public class OpenController extends BaseController {
     /**创建生产过程(烘房 首检)检验*/
     @PostMapping(value = "/createCheckProduceTask")
     public AjaxResult createCheckProduceTask(@RequestBody QcCheckTaskProduceDTO qcCheckTaskProduce) {
-        if(StringUtils.isBlank(qcCheckTaskProduce.getIncomeBatchNo())){
-            return error("[IncomeBatchNo]不能为空");
-        }
+
 
         if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){
             return error("[orderNo]不能为空");
@@ -105,7 +103,7 @@ public class OpenController extends BaseController {
         }
 
         if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){
-            return error("[checkType:produce]不能为空");
+            return error("[checkType]不能为空");
         }
 
         if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){
@@ -116,7 +114,6 @@ public class OpenController extends BaseController {
         return success(openService.insertQcCheckTaskProduce(qcCheckTaskProduce));
     }
 
-
     /**
      * ZL0010-来料检验不合格控制流程提交
      * CQ 厂区、 OEMCM 厂名 、 LLLB 来料类别【0、1】、MATNR 物料编号、MAKTX 物料名称、suppliernum 供应商编码

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

@@ -108,9 +108,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		String createBy = SecurityUtils.getUsername();
 		Date nowDate= DateUtils.getNowDate();
 		//获取当前所选工厂
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		String key = "#header.poolName";
-		String factoryCode = request.getHeader(key.substring(8)).replace("ds_","");
+		String factoryCode = qcCheckTaskIncome.getFactoryCode();
 
 		qcCheckTaskIncome.setCheckNo(bpDD+liushuiStr);
 

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

@@ -215,7 +215,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 			int m=qcCheckTaskIncomeMapper.addCheckUsers(users);
 			logger.info("检查人新增"+m+"成功");
 		}
-
+        /**qc_check_task**/
         qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce);
 
         /**qc_check_task_detail**/
@@ -343,6 +343,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 		List<QcCheckTaskProduce> works = qcCheckTaskProduceMapper.getOrderWorks(qoWork);
 		for(QcCheckTaskProduce productTask:works){
 			productTask.setCheckType("checkTypeSCXJ");//过程检验-巡检
+			productTask.setOrderNo(productTask.getWorkorderCode());
             Date nowTime = DateUtils.getNowDate();
             Date startTime = productTask.getCreateTime();
 

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

@@ -110,33 +110,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where type_code = #{typeCode} and del_flag='0'
 	</select>
     <select id="getOrderWorks" resultType="com.op.quality.domain.QcCheckTaskProduce">
-		select pow.factory_code factoryCode,
-			   powb.batch_code incomeBatchNo,
-			   powb.qc_status,
-			   pow.workorder_code workorderCode,
-			   pow.product_code materialCode,
-			   pow.product_name materialName,
-			   pow.quantity_split quality,
-			   pow.unit,
-			   e.workshop_code supplierCode,
-			   e.workshop_name supplierName,
-			   pow.product_date incomeTime,
-			   task.createTime,
-		       task.order_no orderNo,
-		       task.check_loc checkLoc
-		from pro_order_workorder pow
-	 	left join pro_order_workorder_batch powb on powb.workorder_id = pow.workorder_id
-	 	left join base_equipment e on e.equipment_code = pow.workorder_name
-		left join (
-			select max(create_time) createTime,income_batch_no,order_no,check_loc
-			from qc_check_task
-			where type_code = 'produce'
-			  and  CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
-			GROUP BY income_batch_no,order_no,check_loc
-		) task on task.income_batch_no = powb.batch_code
-		where pow.status = 'w2' and pow.parent_order = '0' and pow.del_flag ='0'
-		  and powb.del_flag = '0' and pow.product_date >= '2023-12-22'
-		  and task.createTime is not null
+		select qct.factory_code factoryCode,
+			   qct.order_no workorderCode,
+			   qct.material_code materialCode,
+			   qct.material_name materialName,
+			   qct.quality,
+			   qct.unit,
+			   qct.supplier_code supplierCode,
+			   qct.supplier_name supplierName,
+			   qct.income_time incomeTime,
+			   max(qct.create_time) createTime,
+			   qct.check_loc checkLoc
+		from qc_check_task qct
+		left join pro_order_workorder pow on qct.order_no = pow.workorder_code
+		where check_type = 'checkTypeSCXJ'
+		  and CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+		  and pow.status = 'w2'
+          group by qct.factory_code,
+			   qct.order_no,qct.material_code,qct.material_name,
+			   qct.quality,qct.unit,qct.supplier_code,qct.supplier_name,
+			   qct.income_time,qct.check_loc
 	</select>
 
     <insert id="insertQcCheckTaskProduce" parameterType="QcCheckTaskProduce">