Merge remote-tracking branch 'origin/master'

hjg

2024-10-28 b5fbd89107c49777ff92a5b81797c56583949ca6

 JavaSource/com/mandi/fendan/service/impl/ErpService.java

@@ -89,6 +89,9 @@
   @Resource
   private SqlSessionFactory sqlSessionFactory;

   @Resource
   private FdVehicleRemarkMapper fdVehicleRemarkMapper;

   @Override
   public ObjectResult<String> tzPrint(Login lg, String bssNo, String ipadd) {
      ObjectResult<String> orr = new ObjectResult<String>();
@@ -377,7 +380,6 @@
               mm.put("td_wfdsl", wt.getTd_wfdsl());
               mm.put("td_wfdzl", BigDecimalfiter.addscal(0, wt.getTd_wfdzl(), Contants.scale));
            } catch (Exception e) {
               // TODO: handle exception
            }
            rl.add(mm);
         }
@@ -504,7 +506,6 @@
            // mm.put("td_wfdzl",BigDecimalfiter.addscal(0, wt.getTd_wfdzl(),
            // Contants.scale));
            // } catch (Exception e) {
            // // TODO: handle exception
            // }
            rl.add(mm);
         }
@@ -796,7 +797,7 @@
   }

   @Override
   @Transactional
   @Transactional(rollbackFor = Exception.class)
   public ObjectResult<Boolean> delFdsheet(Login lg, String bsNo) throws Exception{
      ObjectResult<Boolean> or = new ObjectResult<Boolean>();
      if (lg == null) {
@@ -878,6 +879,7 @@
            String xstdNo = VX.getXstdNo();
            List<Fd_XSTDMX> mxl = new ArrayList<Fd_XSTDMX>();
            Fd_XSTD xstd = this.tdper.getbyTDBH(xstdNo);
            if(xstd==null) continue;
            List<Fd_XSTDMX> MXL = this.tdmxper.getbyBsNoandcmNo(xstd.getTd_tdls(), bsNo, lg.getDepartno());
            double ZZL = 0;
            int ZZS = 0;
@@ -935,7 +937,7 @@

      this.fdvcper.del(vehicleId, lg.getDepartno(), fb.getSdepartNo());

      // 发送NC系统删除分单信息
      // 发送NC系统删除分单信息 todo 发送nc暂时取消掉，正式要恢复
      if (tdl != null && tdl.size() > 0) {
         Fileoperation.AppendContentToFile(Fileoperation.gettestFileName(),
               "取消配车业务单  请求提单 ::" + Jacksonmethod.tojson(tdl, false));
@@ -981,7 +983,8 @@
         }

      }

      // 删除车辆分单的备注remark
      fdVehicleRemarkMapper.deleteByBusinessNo(bsNo);
      or.setCode(0);
      or.setItem(true);
      return or;