ERP_override.git

			@@ -40,6 +40,7 @@
			request.post(`/Replenish/getSelectReplenish/${pageNum}/100`,filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data)
			produceList = deepClone(res.data)
			xGrid.value.loadData(produceList)
			gridOptions.loading=false
			@@ -107,6 +108,11 @@
			customConfig: {
			storage: true
			},
			checkboxConfig: {
			checkMethod: ({ row }) => {
			return row.qualityInsStatus !== 1;
			}
			},
			editConfig: {
			trigger: 'click',
			mode: 'row',
			@@ -114,7 +120,7 @@
			},//表头参数
			columns:[
			{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
			{field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
			{field: 'select',type: "checkbox",title: t('basicData.check'), width: 80,fixed:"left"},
			{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
			{field: 'reportingWorkTime', width: 120, title: t('reportingWorks.reportingWorkTime'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
			{field: 'orderId', width: 120, title: t('order.orderId'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
			@@ -271,6 +277,7 @@




			</script>

			<template>
			@@ -317,6 +324,7 @@
			</template>



			</vxe-grid>
			</div>
			</div>

			@@ -37,6 +37,7 @@
			private String responsibleTeam;
			private String patchArea;
			private String qualityInspector;
			private Integer qualityInsStatus;


			}

			@@ -307,7 +307,9 @@
			dd.responsible_team as responsibleTeam,
			ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
			rw.quality_inspector as qualityInspector,
			ogd.glass_child as glassChild
			ogd.glass_child as glassChild,
			if(dd.responsible_process=rw.this_process,2,dd.quality_ins_status) as qualityInsStatus,
			if(dd.quality_ins_status=1,1,2) as orderBy
			from pp.damage_details dd
			left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number and dd.technology_number=rwd.technology_number
			left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
			@@ -317,7 +319,7 @@
			left join (select * from sd.order_glass_detail group by order_id,order_number,technology_number) as ogd
			on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number and rwd.technology_number=ogd.technology_number

			<where> dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and rw.reviewed_state!=-1
			<where> dd.breakage_quantity-dd.quantity>0 and dd.available=0 and rw.reviewed_state!=-1 /(dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and /
			and o.create_order>0 and dd.patch_status=0
			<if test="patchLogAddDTO.orderId != null and patchLogAddDTO.orderId != ''">
			and o.order_id regexp #{patchLogAddDTO.orderId}
			@@ -383,7 +385,7 @@
			and dd.breakage_reason regexp #{patchLogAddDTO.patchReason}
			</if>
			</where>
			order by dd.id desc
			order by orderBy desc,dd.id desc
			</select>

			<delete id="deleteReplenishMp">

	north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/dto/pp/PatchLogAddDTO.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史