Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -105,6 +105,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
 
     int saveList(@Param("list") List<BusSalesOrderBorrower> list);
 
-    @Select("select sid from bus_sales_order_loancontract where customSid = #{customSid}")
+    @Select("select sid from bus_sales_order_borrower where customSid = #{customSid}")
     String selectByCustomSid(String customSid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -276,4 +276,7 @@ public interface SysUserFeign {
     @PostMapping(value = "/removeRedis")
     ResultBean removeRedis();
 
+    @ApiOperation("获取小程序客户用户信息")
+    @GetMapping("/fetchBySidWx/{sid}")
+    public ResultBean<SysUser> fetchBySidWx(@PathVariable("sid") String sid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -260,4 +260,9 @@ public class SysUserFeignFallback implements SysUserFeign {
 	public ResultBean removeRedis() {
 		return null;
 	}
+
+	@Override
+	public ResultBean<SysUser> fetchBySidWx(String sid) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java

@@ -31,6 +31,11 @@ public interface AppSysUserFeign {
     @ApiOperation(value = "1、app用户登录")
     public ResultBean<SysUserVo> login(@RequestBody SysUserQuery sysUserQuery);
 
+    @PostMapping("/loginWx")
+    @ResponseBody
+    @ApiOperation(value = "小程序客户登录")
+    public ResultBean<SysUserVo> loginWx(@RequestBody SysUserQuery sysUserQuery);
+
     @ApiOperation(value = "手机发送验证码(登录、修改密码、找回密码)")
     @ResponseBody
     @PostMapping("/sendVerificationCodeForApp")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java

@@ -21,6 +21,11 @@ public class AppSysUserFeignFallback implements AppSysUserFeign {
         return new ResultBean<SysUserVo>().fail().setMsg("网站维护，请稍后再试");
     }
 
+    @Override
+    public ResultBean<SysUserVo> loginWx(SysUserQuery sysUserQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean sendVerificationCodeForApp(String mobile, String type, String appId) {
         return ResultBean.fireFail().setMsg("网站维护，请稍后再试");

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -200,4 +200,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<String> selectUserByStaffSid(@Param("list") List<String> staffList);
 
     List<String> selectTokenList();
+
+    SysUser selectByUserNameWx(String userName);
+
+    SysUser selectByMobileWx(String userName);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -416,4 +416,20 @@
                  left join sys_user su on su.staffSid = si.sid
         where si.personTypeKey = '01' and length(su.token)>0
     </select>
+
+    <select id="selectByUserNameWx" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
+        SELECT su.*
+        FROM sys_user su
+        where su.userName = #{userName}
+          and su.isDelete = 0
+          and su.userType = 2
+    </select>
+
+    <select id="selectByMobileWx" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
+        select su.*
+        from sys_user su
+        where su.mobile = #{mobile}
+          and su.isDelete = 0
+          and su.userType = 2
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -703,4 +703,9 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean removeRedis() {
         return sysUserService.removeRedis();
     }
+
+    @Override
+    public ResultBean<SysUser> fetchBySidWx(String sid) {
+        return sysUserService.fetchBySidWx(sid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -1533,4 +1533,51 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         }
         return rb.success();
     }
+
+    public SysUser selectByUserNameWx(String userName) {
+        return baseMapper.selectByUserNameWx(userName);
+    }
+
+    public SysUser selectByMobileWx(String userName) {
+        return baseMapper.selectByMobileWx(userName);
+    }
+
+    /**
+     * 小程序登录后设置token
+     *
+     * @param user
+     * @return
+     */
+    public SysUserVo selectUserWx(SysUser user) {
+        String oldToken = user.getToken();
+        if (StringUtils.isNotBlank(oldToken)) {
+            redisUtil.remove(oldToken);
+        }
+        String uniqueToken = JWTUtil.create(user.getSid() + "");
+        String newToken = "Wx" + uniqueToken;
+        redisUtil.set(newToken, user.getUserName(), USERS_REDIS_SESSION_TL_App);
+        SysUserVo sysUserVo = new SysUserVo();
+        BeanUtil.copyProperties(user, sysUserVo);
+        sysUserVo.setToken(newToken);
+        // 更新用户中的token
+        updateToken(user.getSid(), newToken);
+        //查询是否需要更换密码
+        boolean isTrue = false;
+        String mobile = user.getMobile();
+        if (StringUtils.isNotBlank(mobile)) {
+            String password = mobile.substring(5, 11);
+            String md5 = Encodes.md5(password);
+            if (user.getPassword().equals(md5)) {
+                isTrue = true;
+            }
+        }
+        sysUserVo.setNeedResetPsd(isTrue);
+        return sysUserVo;
+    }
+
+    public ResultBean<SysUser> fetchBySidWx(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysUser sysUser = fetchBySid(sid);
+        return rb.success().setData(sysUser);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

@@ -89,7 +89,7 @@ public class AppSysUserRest implements AppSysUserFeign {
             // 访问后清理key
         }
         boolean isTest = false;
-        if(userQuery.getIsTest() != null){
+        if (userQuery.getIsTest() != null) {
             isTest = userQuery.getIsTest();
         }
         isTest = true;
@@ -217,6 +217,71 @@ public class AppSysUserRest implements AppSysUserFeign {
         }
     }
 
+    @Override
+    public ResultBean<SysUserVo> loginWx(SysUserQuery userQuery) {
+        /*
+        1、根据传参设备appId查询绑定账号
+            1、1未查询到绑定的账号：
+                1、1、1、查询用户登录账号（不存在-->返回“账号不存在”）；
+                1、1、2、账号存在，获取当前账号绑定的设备值：
+                    1）设备值为空，验证登录成功后即绑定设备，返回用户信息，验证不成功返回错误信息（验证码、密码错误）
+                    2）设备值存在，向表sys_exception_log插入数据，返回：当前账号已被其它设备绑定（错误码101（说明：错误码为sys_exception_log的id））
+             1、2查询到绑定的账号
+                1、2、1、根据传参设备appId查询到绑定的账号与用户传递的账号不一致
+                    1）向表sys_exception_log插入数据，返回：当前设备已绑定其它账号（错误码102）
+                1、2、2、根据传参设备appId查询到绑定的账号与用户传递的账号一致，验证登录信息
+                    1）验证登录信息，成功后返回用户信息，验证不成功返回错误信息（验证码、密码错误）
+         */
+        ResultBean<SysUserVo> rb = ResultBean.fireFail();
+        String userName = userQuery.getUserName();
+        String password = userQuery.getPassword();
+        String verifyCode = userQuery.getVerifyCode();
+        String type = userQuery.getType(); // type:1、密码登录2、验证码登录
+
+        if (StringUtils.isBlank(userName)) return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
+        if (type.equals("1")) {
+            if (StringUtils.isBlank(password)) return new ResultBean<SysUserVo>().fail().setMsg("密码不能为空");
+        } else {
+            if (StringUtils.isBlank(verifyCode)) return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
+            // 访问后清理key
+        }
+        SysUser sysUser = sysUserService.selectByUserNameWx(userName);
+        if (sysUser == null) {
+            sysUser = sysUserService.selectByMobileWx(userName);
+            if (sysUser == null) {
+                return rb.setMsg("用户名或密码错误");
+            }
+        }
+        if (type.equals("1")) {
+            String md5 = Encodes.md5(password);
+            if (md5.equals(sysUser.getPassword())) {
+                SysUserVo sysUserVo = sysUserService.selectUserWx(sysUser);
+                if (sysUserVo == null) {
+                    return rb.setMsg("用户名或密码错误");
+                }
+                insertLoginLogWx(sysUser);
+                return new ResultBean<SysUserVo>().success().setData(sysUserVo);
+            } else {
+                return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
+            }
+        } else {
+            String codeFromRedis = redisUtil.get("loginCode" + userName);
+            if (StringUtils.isBlank(codeFromRedis))
+                return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效，请重新发送");
+            if (verifyCode.equals(codeFromRedis.substring(0, 4))) {
+                SysUserVo sysUserVo = sysUserService.selectUserWx(sysUser);
+                if (sysUserVo == null) {
+                    return rb.setMsg("用户名或密码错误");
+                }
+                redisUtil.remove("loginCode" + userName);
+                insertLoginLogWx(sysUser);
+                return new ResultBean<SysUserVo>().success().setData(sysUserVo);
+            } else {
+                return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效，请重新获取");
+            }
+        }
+    }
+
     /**
      * 插入登录日志
      *
@@ -233,6 +298,17 @@ public class AppSysUserRest implements AppSysUserFeign {
         systemLogService.save(systemLog);
     }
 
+    private void insertLoginLogWx(SysUser user) {
+        SystemLog systemLog = new SystemLog();
+        systemLog.setUserName(user.getUserName());
+        String ip = WebUtil.getIpAddr(httpServletRequest);
+        systemLog.setUserIp(ip);
+        systemLog.setEventUrl("portal/v1/appuser/loginWx");
+        systemLog.setEventContent("客户登录");
+        systemLog.setEventName("客户登录");
+        systemLogService.save(systemLog);
+    }
+
     /**
      * 手机发送短信验证码
      *
@@ -360,14 +436,14 @@ public class AppSysUserRest implements AppSysUserFeign {
         }
         String isAdmin = "";
         SysUser sysUser = sysUserService.fetchBySid(userSid);
-        if(sysUser != null){
+        if (sysUser != null) {
             isAdmin = sysUser.getIsAdmin();
         }
-        if("1".equals(isAdmin)){
+        if ("1".equals(isAdmin)) {
             String roleName = sysRoleService.selectByUserSid(userSid);
             userInfo.setPosition(roleName);
 
-        }else{
+        } else {
             //根据用户sid查询岗位
             List<String> stringList = sysUserService.getPost(sysUserVo.getStaffSid());
             stringList.removeAll(Collections.singleton(null));
@@ -455,7 +531,7 @@ public class AppSysUserRest implements AppSysUserFeign {
 
     @Override
     public ResultBean selectAppHaveMessage(String menuSid, String orgPath) {
-        return sysUserService.selectAppHaveMessage(menuSid,orgPath);
+        return sysUserService.selectAppHaveMessage(menuSid, orgPath);
     }
 
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java

@@ -8,6 +8,8 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomer.wx.WxCrmCustomerQuery;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.wx.*;
@@ -64,6 +66,8 @@ public class WxSysUserRest implements WxSysUserFeign {
     @Autowired
     private CrmCustomerFeign crmCustomerFeign;
     @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Autowired
     private SysOrganizationService sysOrganizationService;
     @Autowired
     private HttpServletRequest request;
@@ -304,10 +308,11 @@ public class WxSysUserRest implements WxSysUserFeign {
         }
         boolean isHave = false;
         WxHomePageVo wxHomePageVo = sysUserService.selectHomePage(userSid);
-        ResultBean<CrmCustomer> resultBean = crmCustomerFeign.selectBySid(wxHomePageVo.getStaffSid());
-        if (resultBean.getSuccess()) {
-            wxHomePageVo.setIdTerm(resultBean.getData().getEndDate());
+        if (wxHomePageVo == null){
+            wxHomePageVo = new WxHomePageVo();
         }
+        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData();
+        wxHomePageVo.setIdTerm(crmCustomerTempVo.getEndDate());
         if (StringUtils.isBlank(wxHomePageVo.getHeadImage())) {
             //默认头像
             wxHomePageVo.setHeadImage("http://120.46.131.15:8111/upload/appImage/headImage.jpg");

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java

@@ -13,11 +13,11 @@ import lombok.Data;
 public class AppRepaymentPlanRecord implements Vo {
 
     @ApiModelProperty("月份期数")
-    private String date;
+    private String monthStr;
     @ApiModelProperty("合计")
-    private String total;
+    private String totalStr;
     @ApiModelProperty("月还")
-    private String yh;
+    private String monthlyPaymentStr;
     @ApiModelProperty("其他融")
-    private String qtr;
+    private String otherMonthlyPaymentStr;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -126,7 +126,7 @@ public interface LoanRepaymentScheduleFeign {
     @ApiOperation("微信小程序还款计划列表")
     @PostMapping("/getRepaymentPlanListWx")
     @ResponseBody
-    ResultBean<PagerVo<AppRepaymentPlanVo>> getRepaymentPlanListWx(PagerQuery<AppRepaymentPlanQuery> pagerQuery);
+    ResultBean<PagerVo<AppRepaymentPlanVo>> getRepaymentPlanListWx(@RequestBody PagerQuery<AppRepaymentPlanQuery> pagerQuery);
 
     @ApiOperation("微信小程序查看单车还款计划表")
     @GetMapping("/getRepaymentPlanListByVinNoWx")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -860,7 +860,7 @@
                         '(',
                         period,
                         ')'
-                        ) AS 'date',
+                        ) AS monthStr,
                 (SELECT
                          dueMoney
                  FROM
@@ -868,7 +868,7 @@
                  WHERE vinNo = #{vinNo}
                    AND scheduleSid = #{scheduleSid}
                    AND policyOrOther = '0'
-                   AND a.period = c.period) AS yh,
+                   AND a.period = c.period) AS monthlyPaymentStr,
                 (SELECT
                          dueMoney
                  FROM
@@ -876,7 +876,7 @@
                  WHERE vinNo = #{vinNo}
                    AND scheduleSid = #{scheduleSid}
                    AND policyOrOther = '1'
-                   AND b.period = c.period) AS qtr,
+                   AND b.period = c.period) AS otherMonthlyPaymentStr,
                 (SELECT
                          dueMoney
                  FROM
@@ -894,7 +894,7 @@
                            AND policyOrOther = '1'
                            AND b.period = c.period),
                         0
-                        ) AS total
+                        ) AS totalStr
         FROM
                 loan_repayment_plan_details c
         WHERE vinNo = #{vinNo}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
@@ -6951,8 +6952,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         qw.eq("isDelete", 0);
         qw.orderByDesc("createTime");
         String userSid = pagerQuery.getUserSid();
-        SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
-        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData();
+        SysUser sysUser = sysUserFeign.fetchBySidWx(userSid).getData();
+        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData();
         String borrSid = busSalesOrderBorrowerFeign.selectByCustomSid(crmCustomerTempVo.getSid()).getData();
         qw.eq("borrowerSid", borrSid);
         if (StringUtils.isNotBlank(pagerQuery.getNames())) {
@@ -6991,7 +6992,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 appRepaymentPlanListDetailsWxVo.setOtherManagement(loanRepaymentPlanDetails.get(0).getBankName());
             }
             AppRepaymentPlanThead appRepaymentPlanThead4 = new AppRepaymentPlanThead();
-            appRepaymentPlanThead4.setName("qtr");
+            appRepaymentPlanThead4.setName("otherMonthlyPaymentStr");
             String[] qtrDate = loanRepaymentSchedule.getOtherRepayDate().toString().split("-");
             appRepaymentPlanThead4.setLabel("其他融(" + qtrDate[qtrDate.length - 1] + "日)");
             appRepaymentPlanThead4.setWidth("100");
@@ -7001,7 +7002,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         }
         appRepaymentPlanListDetailsWxVo.setVinNo(vinNo);
         AppRepaymentPlanThead appRepaymentPlanThead1 = new AppRepaymentPlanThead();
-        appRepaymentPlanThead1.setName("date");
+        appRepaymentPlanThead1.setName("monthStr");
         appRepaymentPlanThead1.setLabel("月份(期数)");
         appRepaymentPlanThead1.setFixed(true);
         appRepaymentPlanThead1.setWidth("120");
@@ -7009,14 +7010,14 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         appRepaymentPlanThead1.setAlign("center");
         appRepaymentPlanTheads.add(appRepaymentPlanThead1);
         AppRepaymentPlanThead appRepaymentPlanThead2 = new AppRepaymentPlanThead();
-        appRepaymentPlanThead2.setName("total");
+        appRepaymentPlanThead2.setName("totalStr");
         appRepaymentPlanThead2.setLabel("合计");
         appRepaymentPlanThead2.setWidth("100");
         appRepaymentPlanThead2.setEmptyString("-");
         appRepaymentPlanThead2.setAlign("center");
         appRepaymentPlanTheads.add(appRepaymentPlanThead2);
         AppRepaymentPlanThead appRepaymentPlanThead3 = new AppRepaymentPlanThead();
-        appRepaymentPlanThead3.setName("yh");
+        appRepaymentPlanThead3.setName("monthlyPaymentStr");
         String[] zcpDate = loanRepaymentSchedule.getMainRepayDate().toString().split("-");
         appRepaymentPlanThead3.setLabel("月还(" + zcpDate[zcpDate.length - 1] + "日)");
         appRepaymentPlanThead3.setWidth("100");

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanRecord.java

@@ -13,11 +13,11 @@ import lombok.Data;
 public class RepaymentPlanRecord implements Vo {
 
     @ApiModelProperty("月份期数")
-    private String date;
+    private String monthStr;
     @ApiModelProperty("合计")
-    private String total;
+    private String totalStr;
     @ApiModelProperty("月还")
-    private String yh;
+    private String monthlyPaymentStr;
     @ApiModelProperty("其他融")
-    private String qtr;
+    private String otherMonthlyPaymentStr;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanWxVo.java

@@ -24,6 +24,8 @@ public class RepaymentPlanWxVo implements Vo {
     private String financial;
     @ApiModelProperty("销售专员")
     private String salesName;
+    @ApiModelProperty("资方")
+    private String managementName;
     @ApiModelProperty("车辆信息")
     private List<RepaymentPlanVehWxVo> repaymentPlanVehWxVoList;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java

@@ -76,21 +76,28 @@ public class RepaymentPlanService {
         ResultBean<PagerVo<AppRepaymentPlanVo>> repaymentPlanList = loanRepaymentScheduleFeign.getRepaymentPlanListWx(pagerQuery);
         if (repaymentPlanList.getSuccess()) {
             PagerVo<AppRepaymentPlanVo> data = repaymentPlanList.getData();
-            BeanUtil.copyProperties(data, pagerVo);
             List<RepaymentPlanVehWxVo> vehWxVos = new ArrayList<>();
-            for (AppRepaymentPlanVo record : data.getRecords()) {
-                String vinNo = record.getVinNo();
+            List<AppRepaymentPlanVo> records1 = data.getRecords();
+            List<RepaymentPlanWxVo> records2 = new ArrayList<>();
+            for (AppRepaymentPlanVo appRepaymentPlanVo : records1) {
+                RepaymentPlanWxVo repaymentPlanWxVo = new RepaymentPlanWxVo();
+                repaymentPlanWxVo.setSid(appRepaymentPlanVo.getSid());
+                repaymentPlanWxVo.setContractId(appRepaymentPlanVo.getContractId());
+                repaymentPlanWxVo.setFinancial(appRepaymentPlanVo.getFinancial());
+                repaymentPlanWxVo.setLenderName(appRepaymentPlanVo.getLenderName());
+                repaymentPlanWxVo.setSalesName(appRepaymentPlanVo.getSalesName());
+                repaymentPlanWxVo.setManagementName(appRepaymentPlanVo.getManagementName());
+                String vinNo = appRepaymentPlanVo.getVinNo();
                 String[] vinNos = vinNo.split(",");
                 for (String no : vinNos) {
                     RepaymentPlanVehWxVo repaymentPlanVehWxVo = new RepaymentPlanVehWxVo();
                     repaymentPlanVehWxVo.setVinNo(no);
                     vehWxVos.add(repaymentPlanVehWxVo);
                 }
+                repaymentPlanWxVo.setRepaymentPlanVehWxVoList(vehWxVos);
+                records2.add(repaymentPlanWxVo);
             }
-            List<RepaymentPlanWxVo> records = pagerVo.getRecords();
-            for (RepaymentPlanWxVo record : records) {
-                record.setRepaymentPlanVehWxVoList(vehWxVos);
-            }
+            pagerVo.setRecords(records2);
         }
         return rb.success().setData(pagerVo);
     }

yxt-as-ui/src/api/Common/dictcommons.js

@@ -26,6 +26,15 @@ export function selectOrgSidList(data) {
   })
 }
 
+// 获取分公司
+export function getListOrg(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getListOrg',
+    method: 'get',
+    params: data
+  })
+}
+
 
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
@@ -39,11 +48,20 @@ export function getOrgSidByPath(data) {
 // 根据分公司sid查询分公司名称
 export function fetchBySid(sid) {
   return request({
-    url: 'portal/v1/sysorganization/fetchBySid/' + sid,
+    url: '/portal/v1/sysorganization/fetchBySid/' + sid,
     method: 'get'
   })
 }
 
+
+// 根据分公司Sid获取分公司下所有的部门
+export function getListDeptByOrgSid(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data,
+    method: 'GET'
+  })
+}
+
 // 根据当前登录用户sid获取本分公司下的销售部门和销售专员
 export function selectOrgList(data) {
   return request({

yxt-as-ui/src/api/storage/allocation.js

@@ -8,17 +8,43 @@ export default {
       url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
       method: 'post',
       data: params,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 保存物流信息
+  saveLogisticsInfo: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/saveLogisticsInfo',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
   // 新增、保存
   save: function(data) {
     return request({
       url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
       method: 'post',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 
@@ -36,7 +62,9 @@ export default {
       url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation',
       method: 'post',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 
@@ -47,7 +75,9 @@ export default {
       url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
       method: 'post',
       data: params,
-       headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
@@ -55,12 +85,12 @@ export default {
   getWarehouses: function(params) {
     return request({
       url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
-   method: 'post',
-     data: params,
-     headers: {
-       'Content-Type': 'application/json'
-     }
-   })
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
   },
 
 
@@ -70,7 +100,9 @@ export default {
       url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
       method: 'get',
       params: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 

yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue

@@ -40,7 +40,8 @@
           <el-col :span="24">
             <div class="span-sty"><span class="must">*</span> 加价比例(%)</div>
             <el-form-item>
-              <el-input v-model="formobj.gdMarkupRate" placeholder="" class="addinputw addinputInfo" clearable @input="gdMarkupRateInput"
+              <el-input v-model="formobj.gdMarkupRate" placeholder="" class="addinputw addinputInfo" clearable
+                @input="gdMarkupRateInput"
                 oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
             </el-form-item>
           </el-col>
@@ -66,7 +67,7 @@
           <el-table-column label="区间开始" align="center">
             <template slot-scope="scope">
               <el-input ref="focusAssumptionInput" v-model="scope.row.rangeStart" clearable placeholder=""
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
 
             </template>
           </el-table-column>
@@ -74,7 +75,7 @@
           <el-table-column label="区间截止" align="center">
             <template slot-scope="scope">
               <el-input ref="focusAssumptionInput" v-model="scope.row.rangeEnd" clearable placeholder=""
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
 
             </template>
           </el-table-column>
@@ -82,7 +83,7 @@
           <el-table-column label="加价比例(%)" align="center">
             <template slot-scope="scope">
               <el-input ref="focusAssumptionInput" v-model="scope.row.markupRate" clearable placeholder=""
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
 
             </template>
           </el-table-column>
@@ -133,9 +134,9 @@
       }
     },
     methods: {
-      gdMarkupRateInput(val){
-          console.log("gdMarkupRateInput》》》》", val)
-          console.log("gdMarkupRateInput》》》》", this.formobj.gdMarkupRate)
+      gdMarkupRateInput(val) {
+        console.log("gdMarkupRateInput》》》》", val)
+        console.log("gdMarkupRateInput》》》》", this.formobj.gdMarkupRate)
       },
       indexMethod(index) {
         return index + 1
@@ -151,7 +152,7 @@
             this.$message({
               showClose: true,
               type: 'error',
-              message: '加价比例不能为空222'
+              message: '加价比例不能为空'
             })
 
             return

yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@@ -10,8 +10,9 @@
         </div>
       </div>
       <div class="listconadd">
+
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <div style="display: flex;flex-direction: row;align-items: center;padding: 10px;">
+          <!-- <div style="display: flex;flex-direction: row;align-items: center;padding: 10px;">
 
             <div>
               <span>调出门店：</span>
@@ -28,17 +29,76 @@
               </el-select>
             </div>
 
-          </div>
+          </div> -->
 
-          <div
-            style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;padding: 10px;">
-            <div>商品列表</div>
-            <div v-if="formobj.billNo!=''">单号：{{formobj.billNo}}</div>
-          </div>
+          <el-row class="first_row">
+
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputw addinputInfo"
+                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">调出站</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <div class="span-sty">调入站</div>
+              <el-form-item> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" @change="selectInOrg"
+                  class="addinputInfo">
+                  <el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item> <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName"
+                  style="width:100%">
+                  <el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">经办人</div>
+              <el-form-item> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable
+                  @change="selectOperatorName" class="addinputInfo addinputw">
+                  <el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                  type="textarea" :rows="4" clearable /></el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <div class="title titleOne">
+            <div>调拨商品列表</div>
+          </div>
 
           <el-table :key="commodityKey" :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border
-            style="width: 100%;">
+            style="width: 100%;" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column align="center" width="70" :render-header="commodityHeader">
               <template slot-scope="scope">
@@ -72,10 +132,12 @@
             <el-table-column prop="unit" label="单位" align="center" />
             <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
             <el-table-column prop="warehouseRackCode" label="库位" align="center" />
+            <el-table-column prop="warehouseRackCode" label="单价" align="center" />
             <el-table-column prop="stockCount" label="库存数量" align="center" />
             <el-table-column label="调入仓库" align="center" width="200">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.inWarehouseName" placeholder="请选择" @change="selectWarehouseName(scope.row,$event)">
+                <el-select v-model="scope.row.inWarehouseName" placeholder="请选择"
+                  @change="selectWarehouseName(scope.row,$event)">
                   <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
                   </el-option>
                 </el-select>
@@ -83,14 +145,15 @@
             </el-table-column>
             <el-table-column label="调入库位" align="center" width="120">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择" @change="selectWarehouseAreaCode(scope.row,$event)">
+                <el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择"
+                  @change="selectWarehouseAreaCode(scope.row,$event)">
                   <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
                   </el-option>
                 </el-select>
               </template>
             </el-table-column>
 
-            <el-table-column label="调拨数量" align="center">
+            <el-table-column prop="count" label="调拨数量" align="center">
               <template slot-scope="scope">
                 <el-input @input="commodityComputeYHAndXSJE(scope.row,$event)" v-model="scope.row.count" clearable
                   placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
@@ -98,7 +161,7 @@
             </el-table-column>
             <el-table-column prop="amount" label="调拨金额" align="center" width="100" />
           </el-table>
-          <el-row>
+          <!-- <el-row>
             <el-col :span="24">
               <el-form-item><span>调拨数量：{{ totalQuantity }} , 调拨金额：{{ materialCost }}</span></el-form-item>
             </el-col>
@@ -108,7 +171,7 @@
             <el-col :span="23">
               <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="请填写备注..." /></el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </el-form>
       </div>
     </div>
@@ -118,8 +181,14 @@
 <script>
   import req from '@/api/storage/allocation.js'
   import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    fetchBySid,
     getOrgSidByPath,
     selectOrgSidList,
+    getListDeptByOrgSid,
+    selAllByOrgSidPath
   } from '@/api/Common/dictcommons'
   export default {
     data() {
@@ -127,7 +196,6 @@
         viewTitle: '',
         viewState: 1,
         submitdisabled: false,
-        settleVisible: false, //
         activeNames: '1',
         index: 0,
 
@@ -140,30 +208,39 @@
           total: 0,
           params: {
             name: '',
-            inOrg: "",
-            outOrg: ""
           }
         },
         commodityData: [],
         formobj: {
           "sid": "",
           "billNo": "",
+          "useOrgSid": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
-          "createDate": "",
-          "createUserSid": window.sessionStorage.getItem('userSid'),
           "createByName": window.sessionStorage.getItem('name'),
-          "outOrgSid": "",
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "createTime": getCurrentDate(),
+          "outOrgName": "",
+          "outOrgSid": '',
+          "outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "inOrgName": "",
           "inOrgSid": "",
-          "count": "",
-          "amount": "",
-          "confirmSid": "",
+          "inPlatName": "",
+          "inPlatSid": "",
           "confirmName": "",
-          "finishTime": "",
-          "useOrgSid": '',
+          "confirmSid": "",
+          "remarks": "",
           "wmsInventoryAllocateBillDetailNewList": []
         },
         rules: {},
         orgList: [],
+        deptList: [],
+        operatorNameList: [],
         warehouseList: [],
         warehouseRackList: []
       }
@@ -198,27 +275,40 @@
 
     },
     methods: {
-      selectInOrg(val) {
-        console.log("selectInOrg", val);
+      init() {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.outOrgSid = res.data
+            this.formobj.useOrgSid = res.data
 
-        const choose = this.orgList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInOrg', choose)
-        this.formobj.inOrgSid = choose[0].sid
-        this.formobj.inOrgName = choose[0].name
-      },
+            fetchBySid(res.data).then((res) => {
+              if (res.success) {
+                this.formobj.outOrgName = res.data
+              }
+            })
 
-      selectOutOrg(val) {
-        console.log("selectOutOrg", val);
-        this.formobj.inOrgSid = val
+          }
+        })
 
-        const choose = this.orgList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectOutOrg', choose)
-        this.formobj.outOrgSid = choose[0].sid
-        this.formobj.outOrgName = choose[0].name
 
-      },
+        selectOrgSidList().then((res) => {
+          if (res.success) {
+            console.log("selectOrgSidList", res);
+            this.orgList = res.data
+          }
+        })
+
+        selAllByOrgSidPath({
+          orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            console.log("selAllByOrgSidPath", res);
+            this.operatorNameList = res.data
+          }
+        })
 
-      getWarehouseList() {
         var parpams = {
           orgPath: window.sessionStorage.getItem('defaultOrgPath'),
         }
@@ -230,7 +320,84 @@
 
           }
         })
+
+      },
+      // 合计
+      getSummaries(param) {
+        const {
+          columns,
+          data
+        } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (column.property === 'count') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          } else if (column.property === 'amount') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          }
+        })
+        return sums
+      },
+
+      selectInOrg(val) {
+        console.log("selectInOrg", val);
+
+        const choose = this.orgList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectInOrg', choose)
+        this.formobj.inOrgSid = choose[0].sid
+        this.formobj.inOrgName = choose[0].name
+
+
+        getListDeptByOrgSid(choose[0].sid).then((res) => {
+          if (res.success) {
+            this.formobj.inDeptSid = ''
+            this.formobj.inDeptName = ''
+            console.log("getListDeptByOrgSid", res);
+            this.deptList = res.data
+          }
+        })
+
+
+      },
+
+      selectInDeptName(val) {
+        console.log("selectInDeptName", val);
+
+        const choose = this.deptList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectInDeptName', choose)
+        this.formobj.inPlatSid = choose[0].sid
+        this.formobj.inPlatName = choose[0].name
+
       },
+      selectOperatorName(val) {
+        console.log("selectOperatorName", val);
+        const choose = this.operatorNameList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectOutOrg', choose)
+        this.formobj.confirmSid = choose[0].sid
+        this.formobj.confirmName = choose[0].name
+      },
+
       getWarehouseAreaList(sid) {
         var query = {
           ckSid: sid
@@ -244,85 +411,51 @@
           }
         })
       },
-      selectWarehouseName(row,val) {
+      selectWarehouseName(row, val) {
         console.log("selectWarehouseName", row);
         console.log("selectWarehouseName", val);
 
         const choose = this.warehouseList.filter((item) => item.sid == val)
         console.log('>>>>>>>>>selectInOrg', choose)
-       row.inWarehouseSid= choose[0].sid
-       row.inWarehouseName = choose[0].warehouseName
+        row.inWarehouseSid = choose[0].sid
+        row.inWarehouseName = choose[0].warehouseName
+        row.inWarehouseRackSid = ''
+        row.inWarehouseRackCode = ''
+
 
         this.getWarehouseAreaList(val)
       },
-      selectWarehouseAreaCode(row,val) {
+      selectWarehouseAreaCode(row, val) {
         console.log("selectWarehouseAreaCode", row);
         console.log("selectWarehouseAreaCode", val);
 
         const choose = this.warehouseRackList.filter((item) => item.sid == val)
         console.log('>>>>>>>>>selectInOrg', choose)
-       row.inWarehouseRackSid = choose[0].sid
-       row.inWarehouseRackCode = choose[0].areaCode
+        row.inWarehouseRackSid = choose[0].sid
+        row.inWarehouseRackCode = choose[0].areaCode
 
       },
       showAdd() {
-        getOrgSidByPath({
-          orgPath: window.sessionStorage.getItem('defaultOrgPath')
-        }).then((res) => {
-          if (res.success) {
-            this.formobj.createOrgSid = res.data
-            this.formobj.useOrgSid = res.data
-          }
-        })
 
-
-        selectOrgSidList().then((res) => {
-          if (res.success) {
-            console.log("selectOrgSidList", res);
-            this.orgList = res.data
-          }
-        })
-
-
-        this.viewTitle = '【新增】调拨记录'
+        this.init(),
+          this.viewTitle = '【新增】调拨记录'
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
-        this.getWarehouseList()
       },
-      showEdit(row) {
-
-        getOrgSidByPath({
-          orgPath: window.sessionStorage.getItem('defaultOrgPath')
-        }).then((res) => {
-          if (res.success) {
-            this.formobj.createOrgSid = res.data
-            this.formobj.useOrgSid = res.data
-          }
-        })
-
-
-        selectOrgSidList().then((res) => {
-          if (res.success) {
-            console.log("selectOrgSidList", res);
-            this.orgList = res.data
-          }
-        })
+      showEdit(sid) {
 
+        this.init()
 
         this.viewTitle = '【修改】调拨记录'
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
-        req.init(row.sid).then((res) => {
+        req.init(sid).then((res) => {
           if (res.success) {
             this.formobj = res.data
-
-            this.commodityQuery.params.inOrg = this.formobj.inOrgName
-            this.commodityQuery.params.outOrg = this.formobj.outOrgName
           }
         })
-        this.getWarehouseList()
       },
       // 在头部标题上添加“新增”图标
       commodityHeader(h, {
@@ -470,26 +603,32 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
-         "sid": "",
-         "billNo": "",
-         "createBySid": window.sessionStorage.getItem('userSid'),
-         "createDate": "",
-         "createUserSid": window.sessionStorage.getItem('userSid'),
-         "createByName": window.sessionStorage.getItem('name'),
-         "outOrgSid": "",
-         "inOrgSid": "",
-         "count": "",
-         "amount": "",
-         "confirmSid": "",
-         "confirmName": "",
-         "finishTime": "",
-         "useOrgSid": '',
-         "wmsInventoryAllocateBillDetailNewList": []
+          "sid": "",
+          "billNo": "",
+          "useOrgSid": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "createTime": getCurrentDate(),
+          "outOrgName": "",
+          "outOrgSid": '',
+          "outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "inOrgName": "",
+          "inOrgSid": "",
+          "inPlatName": "",
+          "inPlatSid": "",
+          "confirmName": "",
+          "confirmSid": "",
+          "remarks": "",
+          "wmsInventoryAllocateBillDetailNewList": []
         }
-        this.commodityQuery.params.inOrg = ''
-        this.commodityQuery.params.outOrg = ''
         this.submitdisabled = false
-        this.settleVisible = false
         this.$emit('doback')
       }
     }
@@ -497,16 +636,47 @@
 </script>
 
 <style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
   .span-sty {
-    width: 130px !important;
+    width: 100px !important;
   }
 
   .addinputInfo {
-    margin-left: 120px !important;
+    margin-left: 90px !important;
   }
 
   .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
+    margin-left: 90px !important;
+    width: calc(100% - 80px);
+  }
+
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  /deep/ .el-form-item__error {
+    margin-left: 180px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
   }
 </style>

yxt-as-ui/src/views/storage/allocation/allocationInfo.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>调拨详情</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+
+        <el-row class="first_row">
+
+          <el-col :span="8">
+            <div class="span-sty">申请人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTimeoutOrgName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">调出站</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <div class="span-sty">调入站</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.inOrgName }}</span></el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <el-form-item><span class="addinputInfo">{{ formobj.inPlatName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">经办人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <div class="title titleOne">
+          <div>调拨商品列表</div>
+        </div>
+
+        <el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
+          show-summary :summary-method="getSummaries">
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
+          <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
+          <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
+          <el-table-column prop="unit" label="单位" align="center" />
+          <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
+          <el-table-column prop="warehouseRackCode" label="库位" align="center" />
+          <el-table-column prop="warehouseRackCode" label="单价" align="center" />
+          <el-table-column prop="stockCount" label="库存数量" align="center" />
+          <el-table-column prop="inWarehouseName" label="调入仓库" align="center" />
+          <el-table-column prop="inWarehouseRackCode" label="调入库位" align="center" />
+          <el-table-column prop="count" label="调拨数量" align="center" />
+          <el-table-column prop="amount" label="调拨金额" align="center" width="100" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/allocation.js'
+  export default {
+    data() {
+      return {
+        index: 0,
+        formobj: {},
+      }
+    },
+
+    methods: {
+      // 合计
+      getSummaries(param) {
+        const {
+          columns,
+          data
+        } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (column.property === 'count') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          } else if (column.property === 'amount') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          }
+        })
+        return sums
+      },
+
+
+      showAdd(sid) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+
+        }
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  /deep/ .el-form-item__error {
+    margin-left: 180px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>

yxt-as-ui/src/views/storage/allocation/index.vue

@@ -10,25 +10,48 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
 
-              <el-form-item label="开始日期">
-                <el-date-picker v-model="queryParams.params.createDateStart" @change="selectTime1" type="date"
-                  placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+              <el-form-item label="申请部门">
+                <el-input v-model="queryParams.params.deptName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据日期">
+                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+                至
+                <el-date-picker v-model="queryParams.params.createDateStart" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
                 </el-date-picker>
               </el-form-item>
-              <el-form-item label="结束日期">
-                <el-date-picker v-model="queryParams.params.createDateEnd" @change="selectTime2" type="date"
-                  placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+                至
+                <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
                 </el-date-picker>
               </el-form-item>
-           <!--   <el-form-item label="单据编号">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+              <el-form-item label="调出分公司">
+                <el-input v-model="queryParams.params.outOrgName" placeholder="" clearable />
               </el-form-item>
-              <el-form-item label="制单人">
-                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
+              <el-form-item label="调出站">
+                <el-input v-model="queryParams.params.outPlatName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="调入分公司">
+                <el-input v-model="queryParams.params.inOrgName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="调入站">
+                <el-input v-model="queryParams.params.inPlatName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="经办人">
+                <el-input v-model="queryParams.params.confirmName" placeholder="" clearable />
               </el-form-item>
-              <el-form-item label="库管操作人">
-                <el-input v-model="queryParams.params.warehouseManager" placeholder="" clearable />
-              </el-form-item> -->
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@@ -47,21 +70,29 @@
             @selection-change="selectionLineChangeHandle">
             <el-table-column fixed width="50" type="selection" align="center" />
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="150">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" @click="toDetails(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
             <el-table-column prop="billNo" label="单据编号" align="center" />
-            <el-table-column prop="createDate" label="单据日期" align="center" />
-            <el-table-column prop="createByName" label="制单人姓名" align="center" />
+            <el-table-column prop="createByName" label="申请人" align="center" />
+            <el-table-column prop="createTime" label="申请日期" align="center" />
             <!-- <el-table-column prop="state" label="完成标志" align="center" /> -->
-            <el-table-column  label="完成标志" align="center" width="180">
+            <!--      <el-table-column label="完成标志" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{scope.row.state=='1'?'未完成':'已完成'}}</span>
               </template>
-            </el-table-column>
-            <el-table-column prop="finishTime" label="完成时间" align="center" />
-            <el-table-column prop="outOrgName" label="调出门店" align="center" />
-            <el-table-column prop="inOrgName" label="调入门店" align="center" />
+            </el-table-column> -->
+            <el-table-column prop="finishTime" label="办结日期" align="center" />
+            <el-table-column prop="createOrgName" label="调出分公司" align="center" />
+            <el-table-column prop="outPlatName" label="调出站" align="center" />
+            <el-table-column prop="inOrgName" label="调入分公司" align="center" />
+            <el-table-column prop="inPlatName" label="调入站" align="center" />
+            <el-table-column prop="confirmName" label="经办人" align="center" />
             <el-table-column prop="count" label="调拨数量" align="center" />
             <el-table-column prop="amount" label="调拨金额" align="center" />
-            <el-table-column prop="createOrgName" label="门店" align="center" />
           </el-table>
         </div>
         <!-- End 项目列表 -->
@@ -76,6 +107,90 @@
     <!-- End 查询和其列表部分 -->
     <!-- 新增修改部分组件 -->
     <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
+
+    <el-dialog title="补充物流信息" :visible.sync="dialogVisible" :before-close="handleClose"
+      style="width:120%;margin-left: -10%;">
+      <el-form ref="dataForm" class="formaddcopy02" style="margin-top: -40px;" :model="formobj">
+        <el-row class="first_row">
+          <el-col :span="24">
+            <div class="span-sty">送货方式</div>
+            <el-form-item> <el-select v-model="formobj.deliveryKey" placeholder="请选择送货方式" @change="selectDeliveryKey"
+                class="addinputInfo">
+                <el-option v-for="(item,i) in deliveryKeyList" :key="i" :label="item.name" :value="item.sid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row v-show="formobj.deliveryKey==1">
+          <el-col :span="8">
+            <div class="span-sty">快递单号</div>
+            <el-form-item><el-input v-model="formobj.expressBillNo" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">快递公司</div>
+            <el-form-item><el-input v-model="formobj.expressCompany" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row v-show="formobj.deliveryKey==2">
+          <el-col :span="8">
+            <div class="span-sty">取货人</div>
+            <el-form-item><el-input v-model="formobj.pickUpName" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">取货日期</div>
+            <el-form-item> <el-date-picker v-model="formobj.pickUpDate" type="date" class="addinputw addinputInfo"
+                value-format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row v-show="formobj.deliveryKey==3">
+          <el-col :span="8">
+            <div class="span-sty">送货人</div>
+            <el-form-item><el-input v-model="formobj.deliveryPerson" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">送达日期</div>
+            <el-form-item> <el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputw addinputInfo"
+                value-format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+      <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
+        <el-button type="primary" style="margin-top: 20px;" @click="saveData">确 定</el-button>
+      </div>
+
+    </el-dialog>
+
   </div>
 </template>
 
@@ -85,15 +200,18 @@
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
   import divAdd from './allocationAdd.vue'
+  import divInfo from './allocationInfo.vue'
   export default {
     components: {
       ButtonBar,
       Pagination,
       pageye,
-      divAdd
+      divAdd,
+      divInfo
     },
     data() {
       return {
+        dialogVisible: false,
         btndisabled: false,
         viewState: 1, // 1、列表 2、添加 3、修改 4、查看
         isSearchShow: false,
@@ -107,12 +225,20 @@
             btnKey: 'toAdd',
             btnLabel: '新增'
           },
+
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'el-icon-delete',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
           {
             type: 'primary',
             size: 'small',
             icon: 'edit',
-            btnKey: 'toEdit',
-            btnLabel: '编辑'
+            btnKey: 'toSupplement',
+            btnLabel: '补充物流信息'
           },
           {
             type: 'info',
@@ -127,12 +253,47 @@
           size: 10,
           total: 0,
           params: {
-            "createDateStart": "",
-            "createDateEnd": "",
+            "outOrgName": "",
+            "deptName": "",
+            "createByName": "",
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "finishStartTime": "",
+            "finishEndTime": "",
+            "outPlatName": "",
+            "inOrgName": "",
+            "inPlatName": "",
+            "confirmName": ""
           }
         },
         sids: [],
-        selectionList:[]
+        selectionList: [],
+        deliveryKeyList: [{
+            name: '快递',
+            sid: 1
+          },
+          {
+            name: '对方自取',
+            sid: 2
+          },
+          {
+            name: '我方送货',
+            sid: 3
+          }
+        ],
+        formobj: {
+          "sids": [],
+          "remarks": "",
+          "deliveryKey": "",
+          "deliveryName": "",
+          "expressBillNo": "",
+          "expressCompany": "",
+          "pickUpName": "",
+          "pickUpDate": "",
+          "deliveryPerson": "",
+          "deliveryDate": ""
+        }
       }
     },
     mounted() {
@@ -156,9 +317,12 @@
           case 'toAdd':
             this.toAdd()
             break
-            case 'toEdit':
-              this.toEdit()
-              break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'toSupplement':
+            this.toSupplement()
+            break
           case 'doClose':
             this.doClose()
             break
@@ -207,8 +371,18 @@
           size: 10,
           total: 0,
           params: {
-            "createDateStart": "",
-            "createDateEnd": "",
+            "outOrgName": "",
+            "deptName": "",
+            "createByName": "",
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "finishStartTime": "",
+            "finishEndTime": "",
+            "outPlatName": "",
+            "inOrgName": "",
+            "inPlatName": "",
+            "confirmName": ""
           }
         }
         this.loadList()
@@ -217,123 +391,166 @@
         this.viewState = 2
         this.$refs['divadd'].showAdd()
       },
+      doDel() {
+
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                loading.close()
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            type: "warning",
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+
       selectionLineChangeHandle(val) {
         console.log("val", val);
 
         this.selectionList = val
-
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row.sid)
+      },
+      toDetails(row) {
+        this.viewState = 4
+        this.$refs['divinfo'].showAdd(row.sid)
       },
-      toEdit(){
-        if(this.selectionList.length!=1){
-          this.$message({
-            type: 'warning',
-            message: "请选择一条数据。",
-            showClose: true
-          })
-          return
-        }
 
-        if(this.selectionList[0].state=='2'){
+      toSupplement() {
+        if (this.sids.length > 0) {
+          this.dialogVisible = true
+
+          console.log("toSupplement", this.sids);
+
+        } else {
           this.$message({
-            type: 'warning',
-            message: "此记录已完成,不可重复编辑。",
-            showClose: true
+            type: "warning",
+            showClose: true,
+            message: '请至少选择一条记录进行操作'
           })
-          return
         }
+      },
+      saveData() {
 
+        this.formobj.sids = this.sids
 
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(this.selectionList[0])
-      },
+        req.saveLogisticsInfo(this.formobj).then((resp) => {
+          loading.close()
+          if (resp.success) {
+            this.dialogVisible = false
+            this.$message({
+              type: 'success',
+              message: resp.msg,
+              showClose: true
+            })
+            this.loadList()
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {})
 
-      toBuild() {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
 
+      },
+      handleClose() {
+        this.dialogVisible = false
+      },
+      selectDeliveryKey(val) {
+        console.log("selectDeliveryKey", val);
+        const choose = this.deliveryKeyList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectDeliveryKey', choose)
+        this.formobj.deliveryName = choose[0].name
+        this.formobj.deliveryKey = choose[0].sid
 
-        req.exportExcel(this.queryParams.params).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.ms-excel'
-          })
-          const fileName = '出入库明细_' + this.queryParams.params.createDateStart + '.xls'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
       },
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
       },
 
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-      },
-      toRelevancyInfo(row) {
-        const tip = '请确认是否删除所选品牌?'
-        this.$confirm(tip, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          const loading = this.$loading({
-            lock: true,
-            text: 'Loading',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-          })
-          req.deleteGoods(row.sid).then((resp) => {
-            loading.close()
-            if (resp.success) {
-              this.$message({
-                type: 'success',
-                message: resp.msg,
-                showClose: true
-              })
-              this.loadList()
-            } else {
-              // 根据resp.code进行异常情况处理
-            }
-          }).catch(e => {
-            loading.close()
-          })
-        }).catch(() => {})
-      },
       resetState() {
         this.viewState = 1
       },
-      enableChange(sid, state) {
-        console.log('sid', sid)
-        console.log('state', state)
-        req.updateIsEnable(sid, state).then((resp) => {
-          if (resp.success) {
-            this.$message({
-              type: 'success',
-              message: '状态已更新',
-              showClose: true
-            })
-          } else { // 根据resp.code进行异常情况处理
-          }
-        }).catch(e => {
-          console.log(e)
-        })
-      }
+
     }
   }
 </script>
 <style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 90px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 80px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 80px !important;
+    width: calc(100% - 70px);
+  }
+
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  /deep/ .el-form-item__error {
+    margin-left: 180px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
 </style>

yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@@ -47,13 +47,13 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">供应商</div>
-            <el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
-              class="addinputInfo addinputw">
-              <el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
-                :value="item.sid">
-              </el-option>
-            </el-select>
-
+            <el-form-item> <el-select v-model="formobj.supplierName" placeholder="请选择" clearable
+                @change="selectSupplierName" class="addinputInfo addinputw">
+                <el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
+                  :value="item.sid">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <!-- <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item> -->
           </el-col>
         </el-row>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java

@@ -1,8 +1,8 @@
 package com.yxt.wms.biz.inventory.wmsinventoryallocatebill;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -15,11 +15,13 @@ import java.util.Date;
 public class WmsInventoryAllocateBill extends BaseEntity {
 
     private String billNo;//单据编号
-    private String createDate;//制单日期
-    private String createUserSid;//制单人sid
     private String createByName;//制单人姓名
-    private String outOrgSid;//调出分公司sid
-    private String outOrgName;//调出分公司
+    private String deptSid;//申请部门sid
+    private String deptName;//申请部门名称
+    private String outPlatSid;//调出站sid
+    private String outPlatName;//调出站名称
+    private String inPlatSid;//调入站sid
+    private String inPlatName;//调入站名称
     private String inOrgSid;//调入分公司sid
     private String inOrgName;//调入分公司
     private String count;//调拨数量
@@ -28,7 +30,16 @@ public class WmsInventoryAllocateBill extends BaseEntity {
     private String confirmName;//确认人姓名
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date finishTime;//完成时间
-    private String useOrgSid;//使用组织sid
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
     private String createOrgSid;//创建组织sid
     private String createOrgName;//创建组织名称
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDto.java

@@ -1,45 +0,0 @@
-package com.yxt.wms.biz.inventory.wmsinventoryallocatebill;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.dto.Dto;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:38
- */
-@Data
-public class WmsInventoryAllocateBillDto implements Dto {
-    private String id;
-    private String sid;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    private String remarks;
-    private String isEnable;
-    private String goodsID;//商品ID（唯一编码，入库时生成）
-    private String goodsSid;//商品sid
-    private String billSid;//入库单sid
-    private String billDetailSid;//入库单明细sid
-    private String price1;//销售价格1
-    private String price2;//销售价格2
-    private String price3;//销售价格3
-    private String price4;//销售价格4
-    private String price5;//销售价格5
-    private String unit;//计量单位
-    private String count;//库存数量
-    private String minimumPrice;//销售底价
-    private String freePrice;//三包价格
-    private String firstMaintainPrice;//首保价格
-    private String warehouseSid;//仓库sid
-    private String warehouseName;//仓库名称
-    private String warehouseArea;//货位
-    private String isShowDiscount;//是否显示折扣标志
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date firstInDate;//首次入库日期-计算库龄的依据
-    private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库
-    private String sortNo;//排序
-    private String useOrgSid;//使用组织sid
-    private String createOrgSid;//创建组织sid
-}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java

@@ -14,8 +14,6 @@ import org.apache.ibatis.annotations.Update;
  */
 @Mapper
 public interface WmsInventoryAllocateBillMapper extends BaseMapper<WmsInventoryAllocateBill> {
-    IPage<WmsInventoryAllocateBillVo> listPage(IPage<WmsInventoryAllocateBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryAllocateBill> qw);
-    WmsInventoryAllocateBillVo initialization (@Param("sid") String sid);
 
     IPage<WmsInventoryAllocateBillVoNew> selectPageVo(IPage<WmsInventoryAllocateBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryAllocateBill> qw);
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml

@@ -3,24 +3,6 @@
 <mapper namespace="com.yxt.wms.biz.inventory.wmsinventoryallocatebill.WmsInventoryAllocateBillMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-
-    <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebill.WmsInventoryAllocateBillVo">
-        select
-        a.*,b.goodsName as goodsName
-        from wms_inventory_allocate_bill a
-        left join wms_goods b on b.sid =a.goodsSid
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-    <select id="initialization" resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebill.WmsInventoryAllocateBillVo">
-        select
-            a.*,b.goodsName as goodsName
-        from wms_inventory_allocate_bill a
-                 left join wms_goods b on b.sid =a.goodsSid
-        where a.sid =#{sid}
-    </select>
-
     <select id="selectPageVo"
             resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebill.WmsInventoryAllocateBillVoNew">
         select * from wms_inventory_allocate_bill

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillQuery.java

@@ -1,13 +0,0 @@
-package com.yxt.wms.biz.inventory.wmsinventoryallocatebill;
-
-import com.yxt.common.core.query.Query;
-import lombok.Data;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class WmsInventoryAllocateBillQuery implements Query {
-    private String name;
-}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillQueryNew.java

@@ -15,16 +15,28 @@ import java.util.Date;
 @Data
 public class WmsInventoryAllocateBillQueryNew implements Query {
 
-    @ApiModelProperty("创建开始日期")
+    @ApiModelProperty("调出分公司")
+    private String outOrgName;
+    @ApiModelProperty("申请部门")
+    private String deptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("单据开始日期")
     private String createStartTime;
-    @ApiModelProperty("创建结束日期")
+    @ApiModelProperty("单据结束日期")
     private String createEndTime;
-    @ApiModelProperty("门店")
-    private String createOrgSid;
-    @ApiModelProperty("状态")
-    private String state;
-    @ApiModelProperty("单据范围")
-    private String billFW;
-    @ApiModelProperty("其他查询条件")
-    private String otherQuery;
+    @ApiModelProperty("办结开始日期")
+    private String finishStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String finishEndTime;
+    @ApiModelProperty("调出站")
+    private String outPlatName;
+    @ApiModelProperty("调入分公司")
+    private String inOrgName;
+    @ApiModelProperty("调入站")
+    private String inPlatName;
+    @ApiModelProperty("经办人")
+    private String confirmName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

@@ -35,116 +35,47 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
 
-    public ResultBean<PagerVo<WmsInventoryAllocateBillVo>> listPage(PagerQuery<WmsInventoryAllocateBillQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBillQuery query = pq.getParams();
-        QueryWrapper<WmsInventoryAllocateBill> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("rackName", query.getName());
-        }
-
-        IPage<WmsInventoryAllocateBill> page = PagerUtil.queryToPage(pq);
-        IPage<WmsInventoryAllocateBillVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<WmsInventoryAllocateBillVo> p = PagerUtil.pageToVo(pagging, null);
-        List<WmsInventoryAllocateBillVo> records = pagging.getRecords();
-        return rb.success().setData(p);
-    }
-
-
     public PagerVo<WmsInventoryAllocateBillVoNew> listPageVo(PagerQuery<WmsInventoryAllocateBillQueryNew> pq) {
         WmsInventoryAllocateBillQueryNew query = pq.getParams();
         QueryWrapper<WmsInventoryAllocateBill> qw = new QueryWrapper<>();
-        IPage<WmsInventoryAllocateBill> page = PagerUtil.queryToPage(pq);
-        IPage<WmsInventoryAllocateBillVoNew> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<WmsInventoryAllocateBillVoNew> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    /**
-     * 入库
-     * @param dto
-     * @return
-     */
-//    public ResultBean<WmsInventoryAllocateBill> warehousing(WmsInventoryAllocateBillDto dto) {
-//        ResultBean rb = ResultBean.fireFail();
-//        WmsInventoryAllocateBill wmsInventory=baseMapper.selectOne(new QueryWrapper<WmsInventoryAllocateBill>().eq("goodsSid",dto.getGoodsSid()).eq("warehouseSid",dto.getWarehouseSid()));
-//        if(null==wmsInventory){
-//            WmsInventoryAllocateBill wms=new WmsInventoryAllocateBill();
-//            BeanUtil.copyProperties(dto,wms,"sid","id");
-//            wms.setFirstInDate(new Date());
-//            baseMapper.insert(wms);
-//            return rb.success().setData(wms);
-//        }else{
-//            wmsInventory.setCount(String.valueOf(Double.valueOf(dto.getCount())+Double.valueOf(wmsInventory.getCount())));
-//            baseMapper.updateById(wmsInventory);
-//        }
-//        return rb.success().setData(wmsInventory);
-//    }
-
-    /**
-     * 出库
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean<WmsInventoryAllocateBill> outWarehousing(WmsInventoryAllocateBillDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBill wmsInventory = baseMapper.selectOne(new QueryWrapper<WmsInventoryAllocateBill>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid()));
-        double exisInventory = Double.valueOf(wmsInventory.getCount());
-        double out = Double.valueOf(dto.getCount());
-        if (null == wmsInventory) {
-            return rb.setMsg("此仓库没有相应的商品库存");
+        if (StringUtils.isNotBlank(query.getOutOrgName())){
+            qw.like("createOrgName",query.getOutOrgName());
         }
-        if (exisInventory < -out) {
-            return rb.setMsg("库存不足");
+        if (StringUtils.isNotBlank(query.getDeptName())){
+            qw.like("deptName",query.getDeptName());
         }
-        wmsInventory.setCount(String.valueOf(exisInventory + out));
-        baseMapper.updateById(wmsInventory);
-        return rb.success().setData(wmsInventory);
-    }
-
-    public ResultBean<String> saveOrUpdate(WmsInventoryAllocateBillDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        String sid = "";
-        if (StringUtils.isNotBlank(dto.getSid())) {
-            sid = dto.getSid();
-            WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(dto.getSid());
-            BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
-            baseMapper.updateById(wmsWarehouseRack);
-        } else {
-            WmsInventoryAllocateBill wmsWarehouseRack = new WmsInventoryAllocateBill();
-            sid = wmsWarehouseRack.getSid();
-            BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
-            wmsWarehouseRack.setCreateTime(new DateTime());
-            baseMapper.insert(wmsWarehouseRack);
+        if (StringUtils.isNotBlank(query.getCreateByName())){
+            qw.like("createByName",query.getCreateByName());
         }
-        return rb.success().setMsg("成功");
-    }
-
-    public ResultBean<WmsInventoryAllocateBillVo> initialization(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBillVo vo = baseMapper.initialization(sid);
-        return rb.success().setData(vo);
-    }
-
-
-    public ResultBean delete(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(sid);
-        if (null != wmsWarehouseRack) {
-            baseMapper.deleteById(wmsWarehouseRack.getId());
+        if (StringUtils.isNotBlank(query.getBillNo())){
+            qw.like("billNo",query.getBillNo());
         }
-        return rb.success();
-    }
-
-    public ResultBean updateIsEnable(String sid, String isEnable) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(sid);
-        if (null != wmsWarehouseRack) {
-            wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
-            baseMapper.updateById(wmsWarehouseRack);
+        if (StringUtils.isNotBlank(query.getOutPlatName())){
+            qw.like("outPlatName",query.getOutPlatName());
         }
-        return rb.success().setMsg("成功");
+        if (StringUtils.isNotBlank(query.getInOrgName())){
+            qw.like("inOrgName",query.getInOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getInPlatName())){
+            qw.like("inPlatName",query.getInPlatName());
+        }
+        if (StringUtils.isNotBlank(query.getConfirmName())){
+            qw.like("confirmName",query.getConfirmName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        String finishStartTime = query.getFinishStartTime();
+        String finishEndTime = query.getFinishEndTime();
+        qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(finishStartTime), "date_format (finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+                apply(org.apache.commons.lang3.StringUtils.isNotEmpty(finishEndTime), "date_format (finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
+                );
+        IPage<WmsInventoryAllocateBill> page = PagerUtil.queryToPage(pq);
+        IPage<WmsInventoryAllocateBillVoNew> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<WmsInventoryAllocateBillVoNew> p = PagerUtil.pageToVo(pagging, null);
+        return p;
     }
 
     public WmsInventoryAllocateBillDetailsVoNew fetchDetailsVoBySid(String sid) {
@@ -184,7 +115,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
             String sid = this.insertByDto(dto);
             for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
                 wmsInventoryAllocateBillDetailDtoNew.setBillSid(sid);
-                wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew);
+                wmsInventoryAllocateBillDetailService.insertByDto(wmsInventoryAllocateBillDetailDtoNew);
             }
             return sid;
         }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillVo.java

@@ -1,52 +0,0 @@
-package com.yxt.wms.biz.inventory.wmsinventoryallocatebill;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.vo.Vo;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class WmsInventoryAllocateBillVo implements Vo {
-    private String id;
-    private String sid;
-    private String lockVersion;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date modifyTime;
-    private String remarks;
-    private String isEnable;
-    private String state;
-    private String isDelete;
-    private String goodsID;//商品ID（唯一编码，入库时生成）
-    private String goodsSid;//商品sid
-    private String billSid;//入库单sid
-    private String billDetailSid;//入库单明细sid
-    private String price1;//销售价格1
-    private String price2;//销售价格2
-    private String price3;//销售价格3
-    private String price4;//销售价格4
-    private String price5;//销售价格5
-    private String unit;//计量单位
-    private String count;//库存数量
-    private String minimumPrice;//销售底价
-    private String freePrice;//三包价格
-    private String firstMaintainPrice;//首保价格
-    private String warehouseSid;//仓库sid
-    private String warehouseName;//仓库名称
-    private String warehouseArea;//货位
-    private String isShowDiscount;//是否显示折扣标志
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date firstInDate;//首次入库日期-计算库龄的依据
-    private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库
-    private String sortNo;//排序
-    private String useOrgSid;//使用组织sid
-    private String createOrgSid;//创建组织sid
-    private String goodsName;
-
-}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillVoNew.java

@@ -31,26 +31,28 @@ public class WmsInventoryAllocateBillVoNew implements Vo {
 
     @ApiModelProperty("单据编号")
     private String billNo;
-    @ApiModelProperty("制单人姓名")
+    @ApiModelProperty("分公司")
+    private String createOrgName;
+    @ApiModelProperty("申请部门")
+    private String deptName;
+    @ApiModelProperty("申请人")
     private String createByName;
-    @ApiModelProperty("制单日期")
-    private String createDate;
-    @ApiModelProperty("完成标志")
-    private String state;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("完成时间")
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结日期")
     private Date finishTime;
-    @ApiModelProperty("调出门店")
-    private String outOrgName;
-    @ApiModelProperty("调入门店")
+    @ApiModelProperty("调出站")
+    private String outPlatName;
+    @ApiModelProperty("调入分公司")
     private String inOrgName;
+    @ApiModelProperty("调入站")
+    private String inPlatName;
+    @ApiModelProperty("经办人")
+    private String confirmName;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额")
     private BigDecimal amount;
-    @ApiModelProperty("备注")
-    private String remarks;
-    @ApiModelProperty("门店")
-    private String createOrgName;
-
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDto.java

@@ -1,45 +0,0 @@
-package com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.dto.Dto;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:38
- */
-@Data
-public class WmsInventoryAllocateBillDetailDto implements Dto {
-    private String id;
-    private String sid;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    private String remarks;
-    private String isEnable;
-    private String goodsID;//商品ID（唯一编码，入库时生成）
-    private String goodsSid;//商品sid
-    private String billSid;//入库单sid
-    private String billDetailSid;//入库单明细sid
-    private String price1;//销售价格1
-    private String price2;//销售价格2
-    private String price3;//销售价格3
-    private String price4;//销售价格4
-    private String price5;//销售价格5
-    private String unit;//计量单位
-    private String count;//库存数量
-    private String minimumPrice;//销售底价
-    private String freePrice;//三包价格
-    private String firstMaintainPrice;//首保价格
-    private String warehouseSid;//仓库sid
-    private String warehouseName;//仓库名称
-    private String warehouseArea;//货位
-    private String isShowDiscount;//是否显示折扣标志
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date firstInDate;//首次入库日期-计算库龄的依据
-    private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库
-    private String sortNo;//排序
-    private String useOrgSid;//使用组织sid
-    private String createOrgSid;//创建组织sid
-}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.java

@@ -17,8 +17,6 @@ import java.util.List;
  */
 @Mapper
 public interface WmsInventoryAllocateBillDetailMapper extends BaseMapper<WmsInventoryAllocateBillDetail> {
-    IPage<WmsInventoryAllocateBillDetailVo> listPage(IPage<WmsInventoryAllocateBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryAllocateBillDetail> qw);
-    WmsInventoryAllocateBillDetailVo initialization (@Param("sid") String sid);
 
     @Delete("delete from wms_inventory_allocate_bill_detail where billSid = #{billSid}")
     void delByMainSid(String billSid);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml

@@ -3,24 +3,6 @@
 <mapper namespace="com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-
-    <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailVo">
-        select
-        a.*,b.goodsName as goodsName
-        from wms_inventory_allocate_bill_detail a
-        left join wms_goods b on b.sid =a.goodsSid
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-    <select id="initialization" resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailVo">
-        select
-            a.*,b.goodsName as goodsName
-        from wms_inventory_allocate_bill_detail a
-                 left join wms_goods b on b.sid =a.goodsSid
-        where a.sid =#{sid}
-    </select>
-
     <select id="selByMainSid"
             resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew">
         SELECT

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailQuery.java

@@ -1,13 +0,0 @@
-package com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail;
-
-import com.yxt.common.core.query.Query;
-import lombok.Data;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class WmsInventoryAllocateBillDetailQuery implements Query {
-    private String name;
-}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java

@@ -22,109 +22,6 @@ import java.util.List;
 @Service
 public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<WmsInventoryAllocateBillDetailMapper, WmsInventoryAllocateBillDetail> {
 
-
-    public ResultBean<PagerVo<WmsInventoryAllocateBillDetailVo>> listPage(PagerQuery<WmsInventoryAllocateBillDetailQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBillDetailQuery query = pq.getParams();
-        QueryWrapper<WmsInventoryAllocateBillDetail> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("rackName", query.getName());
-        }
-
-        IPage<WmsInventoryAllocateBillDetail> page = PagerUtil.queryToPage(pq);
-        IPage<WmsInventoryAllocateBillDetailVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<WmsInventoryAllocateBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
-        List<WmsInventoryAllocateBillDetailVo> records = pagging.getRecords();
-        return rb.success().setData(p);
-    }
-
-    /**
-     * 入库
-     * @param dto
-     * @return
-     */
-//    public ResultBean<WmsInventoryAllocateBillDetail> warehousing(WmsInventoryAllocateBillDetailDto dto) {
-//        ResultBean rb = ResultBean.fireFail();
-//        WmsInventoryAllocateBillDetail wmsInventory=baseMapper.selectOne(new QueryWrapper<WmsInventoryAllocateBillDetail>().eq("goodsSid",dto.getGoodsSid()).eq("warehouseSid",dto.getWarehouseSid()));
-//        if(null==wmsInventory){
-//            WmsInventoryAllocateBillDetail wms=new WmsInventoryAllocateBillDetail();
-//            BeanUtil.copyProperties(dto,wms,"sid","id");
-//            wms.setFirstInDate(new Date());
-//            baseMapper.insert(wms);
-//            return rb.success().setData(wms);
-//        }else{
-//            wmsInventory.setCount(String.valueOf(Double.valueOf(dto.getCount())+Double.valueOf(wmsInventory.getCount())));
-//            baseMapper.updateById(wmsInventory);
-//        }
-//        return rb.success().setData(wmsInventory);
-//    }
-
-    /**
-     * 出库
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean<WmsInventoryAllocateBillDetail> outWarehousing(WmsInventoryAllocateBillDetailDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper<WmsInventoryAllocateBillDetail>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid()));
-        double exisInventory = Double.valueOf(wmsInventory.getCount());
-        double out = Double.valueOf(dto.getCount());
-        if (null == wmsInventory) {
-            return rb.setMsg("此仓库没有相应的商品库存");
-        }
-        if (exisInventory < -out) {
-            return rb.setMsg("库存不足");
-        }
-        wmsInventory.setCount(String.valueOf(exisInventory + out));
-        baseMapper.updateById(wmsInventory);
-        return rb.success().setData(wmsInventory);
-    }
-
-    public ResultBean<String> saveOrUpdate(WmsInventoryAllocateBillDetailDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        String sid = "";
-        if (StringUtils.isNotBlank(dto.getSid())) {
-            sid = dto.getSid();
-            WmsInventoryAllocateBillDetail wmsWarehouseRack = fetchBySid(dto.getSid());
-            BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
-            baseMapper.updateById(wmsWarehouseRack);
-        } else {
-            WmsInventoryAllocateBillDetail wmsWarehouseRack = new WmsInventoryAllocateBillDetail();
-            sid = wmsWarehouseRack.getSid();
-            BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
-            wmsWarehouseRack.setCreateTime(new DateTime());
-            baseMapper.insert(wmsWarehouseRack);
-        }
-        return rb.success().setMsg("成功");
-    }
-
-    public ResultBean<WmsInventoryAllocateBillDetailVo> initialization(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBillDetailVo vo = baseMapper.initialization(sid);
-        return rb.success().setData(vo);
-    }
-
-
-    public ResultBean delete(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBillDetail wmsWarehouseRack = fetchBySid(sid);
-        if (null != wmsWarehouseRack) {
-            baseMapper.deleteById(wmsWarehouseRack.getId());
-        }
-        return rb.success();
-    }
-
-    public ResultBean updateIsEnable(String sid, String isEnable) {
-        ResultBean rb = ResultBean.fireFail();
-        WmsInventoryAllocateBillDetail wmsWarehouseRack = fetchBySid(sid);
-        if (null != wmsWarehouseRack) {
-            wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
-            baseMapper.updateById(wmsWarehouseRack);
-        }
-        return rb.success().setMsg("成功");
-    }
-
     public void delByMainSid(String billSid) {
         baseMapper.delByMainSid(billSid);
     }
@@ -133,15 +30,6 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
         return baseMapper.selByMainSid(billSid);
     }
 
-    public void saveOrUpdateDto(WmsInventoryAllocateBillDetailDtoNew dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return;
-        }
-        this.updateByDto(dto);
-    }
-
     public void insertByDto(WmsInventoryAllocateBillDetailDtoNew dto) {
         WmsInventoryAllocateBillDetail entity = new WmsInventoryAllocateBillDetail();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -155,11 +43,4 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
         entity.setWarehouseRackCode(dto.getInWarehouseRackCode());
         baseMapper.insert(entity);
     }
-
-    public void updateByDto(WmsInventoryAllocateBillDetailDtoNew dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailVo.java

@@ -1,52 +0,0 @@
-package com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.vo.Vo;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class WmsInventoryAllocateBillDetailVo implements Vo {
-    private String id;
-    private String sid;
-    private String lockVersion;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date modifyTime;
-    private String remarks;
-    private String isEnable;
-    private String state;
-    private String isDelete;
-    private String goodsID;//商品ID（唯一编码，入库时生成）
-    private String goodsSid;//商品sid
-    private String billSid;//入库单sid
-    private String billDetailSid;//入库单明细sid
-    private String price1;//销售价格1
-    private String price2;//销售价格2
-    private String price3;//销售价格3
-    private String price4;//销售价格4
-    private String price5;//销售价格5
-    private String unit;//计量单位
-    private String count;//库存数量
-    private String minimumPrice;//销售底价
-    private String freePrice;//三包价格
-    private String firstMaintainPrice;//首保价格
-    private String warehouseSid;//仓库sid
-    private String warehouseName;//仓库名称
-    private String warehouseArea;//货位
-    private String isShowDiscount;//是否显示折扣标志
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date firstInDate;//首次入库日期-计算库龄的依据
-    private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库
-    private String sortNo;//排序
-    private String useOrgSid;//使用组织sid
-    private String createOrgSid;//创建组织sid
-    private String goodsName;
-
-}