出库相关

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -473,9 +473,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //用户sid
         bv.setUserSid(dto.getCreateBySid());
         bv.setFormVariables(variables);
-        //流程定义id
-        bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
         if (r == 1) {
+            //流程定义id
+            bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());
@@ -512,6 +512,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             return voResultBean;
         }
         if (r == 2) {
+            bv.setModelId(busVehicleApply.get().getProcDefId());
             // ToDo:驳回到发起人后再次提交
             if (StringUtils.isBlank(dto.getInstanceId())) {
                 return rb.setMsg("参数错误：instanceId");
@@ -583,6 +584,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
         bv.setOrgSidPath(busVehicleApply.getOrgSidPath());
+
         if (bv.getTaskId().equals(busVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -708,17 +708,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     busDiscountpackageHandoverDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
                 }
                 List<BusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists = new ArrayList<>();
-                for (int i = 0; i < discountList.size(); i++) {
-                    BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountList.get(i);
-                    BusDiscountpackageHandoverListDto busDiscountpackageHandoverListDto = new BusDiscountpackageHandoverListDto();
-                    busDiscountpackageHandoverListDto.setPrice(new BigDecimal(busDeliveredDetailsDiscount.getPrice()));
-                    busDiscountpackageHandoverListDto.setNumber(String.valueOf(busDeliveredDetailsDiscount.getGiveNum()));
-                    busDiscountpackageHandoverListDto.setDiscountName(busDeliveredDetailsDiscount.getName());
-                    busDiscountpackageHandoverListDto.setExplain(busDeliveredDetailsDiscount.getDiscountExplain());
-                    busDiscountpackageHandoverListDto.setRemarks(busDeliveredDetailsDiscount.getRemarks());
-                    busDiscountpackageHandoverListDto.setTotalPrice(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
-                    busDiscountpackageHandoverLists.add(busDiscountpackageHandoverListDto);
+                discountList.removeAll(Collections.singleton(null));
+                if(!discountList.isEmpty()){
+                    for (int i = 0; i < discountList.size(); i++) {
+                        BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountList.get(i);
+                        BusDiscountpackageHandoverListDto busDiscountpackageHandoverListDto = new BusDiscountpackageHandoverListDto();
+                        busDiscountpackageHandoverListDto.setPrice(new BigDecimal(busDeliveredDetailsDiscount.getPrice()));
+                        busDiscountpackageHandoverListDto.setNumber(String.valueOf(busDeliveredDetailsDiscount.getGiveNum()));
+                        busDiscountpackageHandoverListDto.setDiscountName(busDeliveredDetailsDiscount.getName());
+                        busDiscountpackageHandoverListDto.setPackageExplain(busDeliveredDetailsDiscount.getDiscountExplain());
+                        busDiscountpackageHandoverListDto.setRemarks(busDeliveredDetailsDiscount.getRemarks());
+                        busDiscountpackageHandoverListDto.setTotalPrice(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
+                        busDiscountpackageHandoverLists.add(busDiscountpackageHandoverListDto);
+                    }
                 }
+
                 busDiscountpackageHandoverDto.setBusDiscountpackageHandoverLists(busDiscountpackageHandoverLists);
                 busDiscountpackageHandoverService.saveOrUpdateDto(busDiscountpackageHandoverDto);
 
@@ -1015,7 +1019,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     //优惠包项目说明
                     busDeliveredDetailsDiscount.setDiscountExplain(busDeliveredDetailsDiscountsVo.getDiscountInfo());
                     //数量
-                    busDeliveredDetailsDiscount.setNum(busDeliveredDetailsDiscountsVo.getTotalNum());
+                    BusSalesOrderDiscount busSalesOrderDiscount = busSalesOrderDiscountService.fetchBySid(busDeliveredDetailsDiscountsVo.getDiscountSid());
+                    busDeliveredDetailsDiscount.setNum(busSalesOrderDiscount.getNum());
                     //本次赠送数量
                     busDeliveredDetailsDiscount.setGiveNum(busDeliveredDetailsDiscountsVo.getDiscountNum());
                     //销售订单中主车优惠的sid
@@ -1426,10 +1431,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 List<BusDeliveredDetailsDiscountsVo> discountUse = appCarListVo.getDiscountUse();
                 for (int j = 0; j < discountUse.size(); j++) {
                     BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = discountUse.get(j);
+                    BusSalesOrderDiscount busSalesOrderDiscount = busSalesOrderDiscountService.fetchBySid(busDeliveredDetailsDiscountsVo.getDiscountSid());
                     //根据discountSid查询已通过或已提交的申请的赠送套餐的数量
                     int count = busDeliveredDetailsDiscountService.selectGiveNumBySid(busDeliveredDetailsDiscountsVo.getDiscountSid());
                     int giveNum = count + busDeliveredDetailsDiscountsVo.getDiscountNum();
-                    if (busDeliveredDetailsDiscountsVo.getTotalNum() < giveNum) {
+                    if (busSalesOrderDiscount.getNum() < giveNum) {
                         return rb.setMsg("车辆赠送的优惠包已超出");
                     }
                 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml

@@ -13,7 +13,7 @@
                  left join bus_delivered_apply_details bad on bad.sid = bd.detailsSid
                  left join bus_delivered_apply bda on bda.sid = bad.applySid
         where bd.discountSid = #{discountSid}
-          and (bda.nodeState = '已办结' or bda.nodeState = '销售支持部经理审批')
+          and (bda.state = 3 or bda.state = 2)
     </select>
 
     <delete id="deleteByApplySid">
@@ -40,14 +40,13 @@
         select IFNULL(SUM(cast(bd.giveNum as signed)), 0) as count
         from bus_delivered_details_discount bd
                  left join bus_delivered_apply ba on ba.sid = bd.applySid
-        where ba.state = 2
-           or ba.state = 3
+        where (ba.state = 2 or ba.state = 3) and bd.discountSid = #{sid}
     </select>
 
     <select id="selectByApplySid"
             resultType="com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount">
-        select IFNULL(SUM(cast(giveNum as signed)), 0) as count,price,discountExplain,name,remarks
+        select IFNULL(SUM(cast(giveNum as signed)), 0) as giveNum,price,discountExplain,name,remarks
         from bus_delivered_details_discount
-        where applySid = #{sid} group by discountSid
+        where applySid = #{sid} and length(giveNum) >0 group by discountSid
     </select>
 </mapper>