Administrator
2022-12-15 9ce4bb2b6bd1378ba7b0bd6681d22cb37a5e1452
空客户不配车
已修改4个文件
42 ■■■■■ 文件已修改
JavaSource/com/mandi/fendan/controller/Fd_bsheetTaskCon.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
JavaSource/com/mandi/fendan/controller/Fd_businessCon.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
JavaSource/com/mandi/fendan/service/impl/ErpService.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
JavaSource/com/mandi/fendan/controller/Fd_bsheetTaskCon.java
@@ -8,6 +8,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mandi.springmvc.logs.OpLogs;
import com.mandi.system.persist.ModuleEnum;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -80,6 +82,7 @@
     */
    @RequestMapping(value="/changeVehicle.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="换车",module = ModuleEnum.业务模块)
    public String changeVehicle(HttpServletRequest r,HttpServletResponse re){
        String bsNo=RequestParam.getSqlString(r, "bussinessNo");
        String vehicleInfo=RequestParam.getString(r, "vehicle");
@@ -105,6 +108,7 @@
     */
    @RequestMapping(value="/delItem.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="取消派车",module = ModuleEnum.业务模块)
    public String delXSFD(HttpServletRequest r,HttpServletResponse re){
        String bsNo=RequestParam.getSqlString(r, "bussinessNo");
        Login lg=SessionMethod.getlogin(r.getSession());
@@ -314,6 +318,7 @@
     */
    @RequestMapping(value="/delbypch.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="批次号取消配车", module = ModuleEnum.业务模块)
    public String delbypc(HttpServletRequest r,HttpServletResponse re){
        String tdno =RequestParam.getSqlString(r, "tdno");//提单编号
        String pch =RequestParam.getSqlString(r, "pch");//批次号
JavaSource/com/mandi/fendan/controller/Fd_businessCon.java
@@ -308,6 +308,7 @@
     */
    @RequestMapping(value="/doBindByList.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="整单配车",module = ModuleEnum.业务模块)
    public String doBindByList(HttpServletRequest r,HttpServletResponse re){
        String list=RequestParam.getString(r, "list");
        String vehicle=RequestParam.getString(r, "vehicle");
@@ -331,6 +332,7 @@
     * @param re
     * @return
     */
    @OpLogs(name="整单取消配车",module = ModuleEnum.业务模块)
    @RequestMapping(value="/doUnbindByList.htm",method={RequestMethod.POST})
    @ResponseBody
    public String doUnbindByList(HttpServletRequest r,HttpServletResponse re){
@@ -357,6 +359,7 @@
     */
    @RequestMapping(value="/doUnbind.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="明细取消配车", module = ModuleEnum.业务模块)
    public String doUnbind(HttpServletRequest r,HttpServletResponse re){
        String list=RequestParam.getString(r, "list");//[{"tdls":,"tdfl":}]
        String tdbh=RequestParam.getSqlString(r, "tdbh");//提单编号
@@ -383,6 +386,7 @@
     */
    @RequestMapping(value="/doBind.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="分单配车",module = ModuleEnum.业务模块)
    public String doBind(HttpServletRequest r,HttpServletResponse re){
        String list=RequestParam.getString(r, "list");//[{"tdls":,"tdfl":}]
        String vehicle=RequestParam.getString(r, "vehicle");//[{"tdls":,"tdfl":}]
@@ -414,6 +418,7 @@
     */
    @RequestMapping(value="/closexstd.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="关闭分单",module = ModuleEnum.业务模块)
    public String closeXstd(HttpServletRequest r,HttpServletResponse re){
        String vehicleId=RequestParam.getSqlString(r, "vehicleId")==null?"":RequestParam.getSqlString(r, "vehicleId").trim();
        String driver=RequestParam.getSqlString(r, "driver")==null?"":RequestParam.getSqlString(r, "driver").trim();
@@ -440,6 +445,7 @@
     */
    @RequestMapping(value="/openxstd.htm",method={RequestMethod.POST})
    @ResponseBody
    @OpLogs(name="打开分单",module = ModuleEnum.业务模块)
    public String openXSTD(HttpServletRequest r,HttpServletResponse re){
        String xstdNo=RequestParam.getSqlString(r, "tdNo");//提单编号
        Login lg=SessionMethod.getlogin(r.getSession());
JavaSource/com/mandi/fendan/service/impl/ErpService.java
@@ -5,6 +5,7 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.mandi.basicconfig.penum.PrefixEnum;
import com.mandi.basicconfig.persist.Nckh;
import com.mandi.common.*;
import com.mandi.common.ParamFileter.Fileoperation;
import com.mandi.common.ParamFileter.RegexCheck;
@@ -19,7 +20,9 @@
import com.mandi.fendan.util.ConvertTool;
import com.mandi.fendan.util.FdtoNc;
import com.mandi.fendan.util.persist.*;
import com.mandi.springmvc.logs.OpLogs;
import com.mandi.system.persist.Login;
import com.mandi.system.persist.ModuleEnum;
import com.mandi.system.persist.UserType;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.map.HashedMap;
@@ -793,6 +796,7 @@
    }
    @Override
    @Transactional
    public ObjectResult<Boolean> delFdsheet(Login lg, String bsNo) throws Exception{
        ObjectResult<Boolean> or = new ObjectResult<Boolean>();
        if (lg == null) {
@@ -1059,8 +1063,6 @@
                return orr;
            }
        }
        JsonParser jp = new JsonParser();
        Fd_Vehicle fdv1 = new Fd_Vehicle();
        // 检查车辆信息
@@ -1154,6 +1156,11 @@
                }
                if (StringUtils.isBlank(Rcompany)) {
                    Map<String, Object> mm = this.dqper.getKH(td.getTd_khbh());
                    if(mm == null || mm.size() == 0) { // 客户必须存在,否则无法分单
                        orr.setCode(1);
                        orr.setErrmsg("该提单客户不存在,请检查数据!");
                        return orr;
                    }
                    //
                    /*
                    * 1、外贸有发票编号,内贸没有发票编号
JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java
@@ -9,9 +9,15 @@
import javax.annotation.Resource;
import com.mandi.basicconfig.mapper.NczsjMapper;
import com.mandi.basicconfig.persist.Nckh;
import com.mandi.fendan.mapper.*;
import com.mandi.fendan.util.ConvertTool;
import com.mandi.servlet.file.impl.FileLoadImpl;
import com.mandi.springmvc.logs.OpLogs;
import com.mandi.system.persist.ModuleEnum;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.ss.usermodel.charts.ScatterChartSeries;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +56,7 @@
@Service
public class Fd_BsheetService implements Ifd_bsheetService {
    private Logger log= Logger.getLogger(Fd_BsheetService.class);
    @Resource
    private Fd_BsheetMapper bsper;
@@ -75,6 +82,9 @@
    private Fd_YKTMapper yktmper;
    @Resource
    private FdMxWlgsMapper fdMxWlgsMapper;
    @Resource
    private NczsjMapper zsjper;
    @Override
    @Transactional(rollbackFor=Exception.class)
@@ -122,6 +132,15 @@
            orr.setCode(1);
            orr.setErrmsg("该提单已经分单完成,不能分单!");
            return orr;
        }
        // 判断是否存在客户
        if(StringUtils.isBlank(xstd.getTd_fpbh())){
            Nckh nckh = zsjper.getNckhbyCode(xstd.getTd_khbh());// 客户不存在的特殊情况是不应该存在的,以防万一,加判空。
            if(nckh == null) {
                orr.setCode(1);
                orr.setErrmsg("该提单客户不存在,请检查数据!");
                return orr;
            }
        }
        //送货
        if(xstd.getTd_ztbz()==2){
@@ -435,6 +454,7 @@
                }
            }
        }catch(Exception e){
            e.printStackTrace();
            if(saveBT){
                JsonObject jo=new JsonObject();
                jo.addProperty("bussinessNo", bbsNo);