|
@ -45,6 +45,7 @@ import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRep |
|
|
import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService; |
|
|
import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService; |
|
|
import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; |
|
|
import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; |
|
|
import com.yxt.anrui.as.biz.asserviceitem.AsServiceItemService; |
|
|
import com.yxt.anrui.as.biz.asserviceitem.AsServiceItemService; |
|
|
|
|
|
import com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailService; |
|
|
import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService; |
|
|
import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService; |
|
|
import com.yxt.anrui.as.feign.crm.CrmCustomerTemp; |
|
|
import com.yxt.anrui.as.feign.crm.CrmCustomerTemp; |
|
|
import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign; |
|
|
import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign; |
|
@ -150,6 +151,9 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
private AsBillSettelApplyService asBillSettelApplyService; |
|
|
private AsBillSettelApplyService asBillSettelApplyService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private AsBusrepairBillAitemspecService asBusrepairBillAitemspecService; |
|
|
private AsBusrepairBillAitemspecService asBusrepairBillAitemspecService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private AsTechTitleDetailService asTechTitleDetailService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 维修领料获取派工单 |
|
|
* 维修领料获取派工单 |
|
|
* |
|
|
* |
|
@ -1438,6 +1442,54 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
String sid = dto.getSid(); |
|
|
String sid = dto.getSid(); |
|
|
AsBusrepairBill asBusrepairBill = fetchBySid(sid); |
|
|
AsBusrepairBill asBusrepairBill = fetchBySid(sid); |
|
|
if (asBusrepairBill.getNodeCode() == 5) { |
|
|
if (asBusrepairBill.getNodeCode() == 5) { |
|
|
|
|
|
//计算工时提成分配维修人员
|
|
|
|
|
|
List<AsBusrepairBillSitem> sitems = asBusrepairBillSitemService.fetchByBillSid(sid); |
|
|
|
|
|
if (sitems != null) { |
|
|
|
|
|
if (!sitems.isEmpty()) { |
|
|
|
|
|
for (AsBusrepairBillSitem sitem : sitems) { |
|
|
|
|
|
BigDecimal examineHourPrice = BigDecimal.ZERO; |
|
|
|
|
|
if (null != sitem.getExamineHourPrice()) { |
|
|
|
|
|
examineHourPrice = sitem.getExamineHourPrice(); |
|
|
|
|
|
} |
|
|
|
|
|
if (examineHourPrice.compareTo(BigDecimal.ZERO) > 0) { |
|
|
|
|
|
String billSid = sitem.getBillSid(); |
|
|
|
|
|
String serviceItemSid = sitem.getServiceItemSid(); |
|
|
|
|
|
List<AsBusrepairBillSitemRepairer> repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(billSid, serviceItemSid); |
|
|
|
|
|
if (null != repairers) { |
|
|
|
|
|
if (!repairers.isEmpty()) { |
|
|
|
|
|
//查询权重之和
|
|
|
|
|
|
BigDecimal sum = BigDecimal.ZERO; |
|
|
|
|
|
Map<String, BigDecimal> map = new HashMap<>(); |
|
|
|
|
|
for (AsBusrepairBillSitemRepairer repairer : repairers) { |
|
|
|
|
|
String rSid = repairer.getSid(); |
|
|
|
|
|
String pSid = repairer.getRepairerSid(); |
|
|
|
|
|
BigDecimal weight = BigDecimal.ZERO; |
|
|
|
|
|
String w = asTechTitleDetailService.selWeightByUserSid(pSid); |
|
|
|
|
|
if (StringUtils.isNotBlank(w)) { |
|
|
|
|
|
weight = new BigDecimal(w); |
|
|
|
|
|
} |
|
|
|
|
|
sum = sum.add(weight); |
|
|
|
|
|
map.put(rSid,weight); |
|
|
|
|
|
} |
|
|
|
|
|
if (sum.compareTo(BigDecimal.ZERO) > 0) { |
|
|
|
|
|
if (map.size() > 0) { |
|
|
|
|
|
for (Map.Entry<String, BigDecimal> entry : map.entrySet()) { |
|
|
|
|
|
String mSid = entry.getKey(); |
|
|
|
|
|
BigDecimal mWeight = entry.getValue(); |
|
|
|
|
|
AsBusrepairBillSitemRepairer repairer = asBusrepairBillSitemRepairerService.fetchBySid(mSid); |
|
|
|
|
|
BigDecimal finalWeight = mWeight.divide(sum, 2, BigDecimal.ROUND_HALF_UP).multiply(examineHourPrice); |
|
|
|
|
|
repairer.setCommission(finalWeight); |
|
|
|
|
|
asBusrepairBillSitemRepairerService.updateById(repairer); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (asBusrepairBill.getSubject().equals("保内")) { |
|
|
if (asBusrepairBill.getSubject().equals("保内")) { |
|
|
if (asBusrepairBill.getOldIsReclaim() != 1) { |
|
|
if (asBusrepairBill.getOldIsReclaim() != 1) { |
|
|
return rb.setMsg("请先完成旧件入库,再进行操作!"); |
|
|
return rb.setMsg("请先完成旧件入库,再进行操作!"); |
|
@ -2127,6 +2179,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
public void updateOutFactory(String sid) { |
|
|
public void updateOutFactory(String sid) { |
|
|
baseMapper.updateOutFactory(sid); |
|
|
baseMapper.updateOutFactory(sid); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public PagerVo<GoodsReceiveVo> notConfirmList(PagerQuery<GoodsReceiveQuery> pagerQuery) { |
|
|
public PagerVo<GoodsReceiveVo> notConfirmList(PagerQuery<GoodsReceiveQuery> pagerQuery) { |
|
|
GoodsReceiveQuery query = pagerQuery.getParams(); |
|
|
GoodsReceiveQuery query = pagerQuery.getParams(); |
|
|
QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>(); |
|
|
QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>(); |
|
|