修改补片反审出现的问题，修改标签打印自定义标题的显示，流程卡保存添加对订单数量的验证

chenlu

2025-03-07 e8185757637e41f465c898336bad9e4bb7329821

修改补片反审出现的问题，修改标签打印自定义标题的显示，流程卡保存添加对订单数量的验证

 north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue

@@ -633,7 +633,7 @@
  {
    tid: 'custom4', title: '自定义4', data: '', type: 'text',
    options: {
      field: '',
      field: 'custom4',
      testData: '',
      width:270,
      height: 16,
@@ -645,7 +645,7 @@
  {
    tid: 'custom5', title: '自定义5', data: '', type: 'text',
    options: {
      field: '',
      field: 'custom4',
      testData: '',
      width:270,
      height: 16,

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -73,6 +73,7 @@

const orderId = route.query.orderId
const productionId = route.query.productionId
const orderQuantity = route.query.quantity

const orderOtherMoney = ref(null)

@@ -894,6 +895,16 @@
              gridLeftOptions.toolbarConfig.buttons[0].disabled=false
              return;
            }

            // 计算 $table 里 quantity 字段的总和
            let totalQuantity = selectRecords.reduce((sum, record) => sum + (record.quantity || 0), 0);

            // 对比全局变量 orderQuantity
            if (totalQuantity !== orderQuantity) {
              ElMessage.warning(`所选数据的数量总和 (${totalQuantity}) 与订单数量 (${orderQuantity}) 不匹配，请检查后重试！`);
              gridLeftOptions.toolbarConfig.buttons[0].disabled = false;
              return;
            }
            // if (leftData.length!=selectRecords.length){
            //   ElMessage.warning('请勾选所有数据进行保存')
            //   gridLeftOptions.toolbarConfig.buttons[0].disabled=false

 north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue

@@ -19,7 +19,7 @@
      //alert('我接收到子组件传送的编辑信息')
      router.push({
        path: '/main/processCard/AddProcessCard',
        query: {orderId: row.order_id, productionId: row.production_id}
        query: {orderId: row.order_id, productionId: row.production_id, quantity:row.quantity}
      })
      break
    }

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java

@@ -4,7 +4,6 @@
import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.userInfo.Log;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -50,6 +49,6 @@

    Boolean updateReplenishCancel(@Param("patchLog") PatchLog patchLog);

    Integer selectProjectCount(String processId);
    Integer selectProjectCount(String processId, String patchId, Integer technologyNumber);
}


 north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java

@@ -306,7 +306,7 @@
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //查询是否已生成工程号
                    Integer projectCount = patchMapper.selectProjectCount(patchLog.getProcessId());
                    Integer projectCount = patchMapper.selectProjectCount(patchLog.getProcessId(),patchLog.getPatchId(),patchLog.getTechnologyNumber());
                    //查询流程卡工艺流程
                    String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(patchLog.getProcessId(), String.valueOf(patchLog.getTechnologyNumber()));
                    if (projectCount == 0){

 north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml

@@ -413,8 +413,9 @@

    <select id="selectProjectCount">
        SELECT COUNT(*)
        FROM flow_card
        WHERE process_id= #{processId} and project_no IS not NULL;
        FROM patch_log
        WHERE process_id= #{processId} and patch_id=#{patchId} and technology_number = #{technologyNumber}
          and project_no IS not NULL;
    </select>

</mapper>