Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-17 b17507f4960c8544bae4d5e3d235b239bca1dc9f

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

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

@@ -137,13 +137,14 @@
  display: flex;
  justify-content: left;
  flex-wrap: wrap;
  margin-left: 5px;
  width: 400px;
}

#entirety{
  text-align: center;
  width: 50%;
  height: 105px;
  height: 140px;
  border: black 1px;
}

.row1 {

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

@@ -179,6 +179,12 @@
  font-weight: bold;
  font-size: 12pt;
}
.row1 span {
  font-size: 12pt;
}
.row2 span {
  font-size: 12pt;
}
.row5 span {
  font-size: 12pt;
}

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -414,6 +414,8 @@
             if(res.code==200 && res.data===true){
               ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
               router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
             }else if(res.data===false){
               ElMessage.warning("订单存在其他金额单价没有填写")
             }else{
               ElMessage.warning(t('basicData.msg.saveFail'))
             }

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -196,17 +196,26 @@
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          dialogTableVisible.value = true
          sheetIndex.value=1
          if(rowClickIndex.value.deliveryState>0){
            dialogTableVisible.value = true
            sheetIndex.value=1
          }else{
            ElMessage.warning(t('order.orderNotApproved'))
          }
          break

        }
        case 'sheet2': {
          if(rowClickIndex.value===null){
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          dialogTableVisible.value = true
          sheetIndex.value=2
          if(rowClickIndex.value.deliveryState>0){
            dialogTableVisible.value = true
            sheetIndex.value=2
          }else{
            ElMessage.warning(t('order.orderNotApproved'))
          }
          break
        }
      }

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

@@ -25,6 +25,8 @@

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

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

    Boolean updateReplenish(@Param("patchLog") PatchLog patchLog ,  @Param("userName") String userName);

    Boolean updateOrderProcessDetail(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork );

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

@@ -94,6 +94,7 @@
                    //添加返工记录，修改次破明细数量
                    patchMapper.insertReplenish(patchLog,oddNumber);
                    patchMapper.updateDamageDetails(patchLog);
                    patchMapper.updateReportingWorkDetail(patchLog);
                }
            }


 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java

@@ -160,7 +160,7 @@
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();


        try {
            String deliveryId="";
            String oddNumber;
            if (object.get("deliveryId") != null) {
@@ -255,12 +255,12 @@
                            if(isnull) {
                                Map<String, Object> moneryItemmap = new HashMap<>();
                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
                                System.out.println(deliveryDetailOtherMoney.get("monery"));
                                if(deliveryDetailOtherMoney.get("monery")!=null){
                                    otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                    moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                                    moneryList.add(moneryItemmap);
                                }else{
                                    TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                                    return false;
                                }
                            }
@@ -321,7 +321,16 @@
            } else {
                return false;
            }
        }catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;
    }

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

@@ -779,7 +779,7 @@
                                              pl.technology_number = fc.technology_number
        where pl.create_time between #{selectTime1} and #{selectTime2}
        GROUP BY fc.process_id, ogd.technology_number
        order by fc.process_id, ogd.technology_number
        order by pl.id,fc.process_id, ogd.technology_number
    </select>

    <select id="getRepairPrintCustomData">
@@ -933,7 +933,7 @@
                                           pl.technology_number = fc.technology_number
        where pl.create_time between #{selectTime1} and #{selectTime2}
        GROUP BY fc.process_id, ogd.technology_number
        order by fc.process_id, ogd.technology_number
        order by pl.id,fc.process_id, ogd.technology_number
    </select>

    <select id="getDetailListLike">

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

@@ -110,6 +110,11 @@
        update pp.damage_details set quantity=quantity+#{patchLog.patchNum},patch_status=1 where id=#{patchLog.reviewer}
    </update>

    <update id="updateReportingWorkDetail"  >
        update pp.reporting_work_detail set patch_status=1 where reporting_work_id=#{patchLog.reportingWorkId}
                                          and order_number=#{patchLog.orderSort} and technology_number=#{patchLog.technologyNumber}
    </update>


    <select id="getSelectReplenish">
        select date(rw.reporting_work_time) as reportingWorkTime,