|
|
|
@ -5,9 +5,13 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDetailsVo; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbill.GoodsDetailsVo; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbill.SitemVo; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairinventorybill.*; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; |
|
|
|
import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; |
|
|
|
import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; |
|
|
|
@ -96,35 +100,35 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep |
|
|
|
public ResultBean<String> saveOrUdateBill(AsBusrepairInventorybillDto dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
String sid = dto.getSid(); |
|
|
|
if (StringUtils.isBlank(sid)) { |
|
|
|
AsBusrepairInventorybill asBusrepairInventorybill = new AsBusrepairInventorybill(); |
|
|
|
BeanUtil.copyProperties(dto, asBusrepairInventorybill, "sid"); |
|
|
|
sid = asBusrepairInventorybill.getSid(); |
|
|
|
List<AsBusrepairInventorybillDetailDto> detailList = dto.getDetailList(); |
|
|
|
detailList.removeAll(Collections.singleton(null)); |
|
|
|
if (!detailList.isEmpty()) { |
|
|
|
asBusrepairInventorybillDetailService.saveOrUpdateDetail(detailList, sid); |
|
|
|
} |
|
|
|
String orgPath = dto.getOrgPath(); |
|
|
|
if (StringUtils.isNotBlank(orgPath)) { |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
asBusrepairInventorybill.setCreateOrgSid(useOrgSid); |
|
|
|
asBusrepairInventorybill.setUseOrgSid(useOrgSid); |
|
|
|
} |
|
|
|
baseMapper.insert(asBusrepairInventorybill); |
|
|
|
} else { |
|
|
|
AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid); |
|
|
|
if (asBusrepairInventorybill == null) { |
|
|
|
return rb.setMsg("该单据不存在"); |
|
|
|
} |
|
|
|
BeanUtil.copyProperties(dto, asBusrepairInventorybill, "sid"); |
|
|
|
List<AsBusrepairInventorybillDetailDto> detailList = dto.getDetailList(); |
|
|
|
detailList.removeAll(Collections.singleton(null)); |
|
|
|
if (!detailList.isEmpty()) { |
|
|
|
asBusrepairInventorybillDetailService.saveOrUpdateDetail(detailList, sid); |
|
|
|
} |
|
|
|
baseMapper.updateById(asBusrepairInventorybill); |
|
|
|
} |
|
|
|
// if (StringUtils.isBlank(sid)) {
|
|
|
|
// AsBusrepairInventorybill asBusrepairInventorybill = new AsBusrepairInventorybill();
|
|
|
|
// BeanUtil.copyProperties(dto, asBusrepairInventorybill, "sid");
|
|
|
|
// sid = asBusrepairInventorybill.getSid();
|
|
|
|
// List<AsBusrepairInventorybillDetailDto> detailList = dto.getDetailList();
|
|
|
|
// detailList.removeAll(Collections.singleton(null));
|
|
|
|
// if (!detailList.isEmpty()) {
|
|
|
|
// asBusrepairInventorybillDetailService.saveOrUpdateDetail(detailList, sid);
|
|
|
|
// }
|
|
|
|
// String orgPath = dto.getOrgPath();
|
|
|
|
// if (StringUtils.isNotBlank(orgPath)) {
|
|
|
|
// String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
|
|
|
|
// asBusrepairInventorybill.setCreateOrgSid(useOrgSid);
|
|
|
|
// asBusrepairInventorybill.setUseOrgSid(useOrgSid);
|
|
|
|
// }
|
|
|
|
// baseMapper.insert(asBusrepairInventorybill);
|
|
|
|
// } else {
|
|
|
|
// AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid);
|
|
|
|
// if (asBusrepairInventorybill == null) {
|
|
|
|
// return rb.setMsg("该单据不存在");
|
|
|
|
// }
|
|
|
|
// BeanUtil.copyProperties(dto, asBusrepairInventorybill, "sid");
|
|
|
|
// List<AsBusrepairInventorybillDetailDto> detailList = dto.getDetailList();
|
|
|
|
// detailList.removeAll(Collections.singleton(null));
|
|
|
|
// if (!detailList.isEmpty()) {
|
|
|
|
// asBusrepairInventorybillDetailService.saveOrUpdateDetail(detailList, sid);
|
|
|
|
// }
|
|
|
|
// baseMapper.updateById(asBusrepairInventorybill);
|
|
|
|
// }
|
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
|
|
|
|
|
@ -174,4 +178,88 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep |
|
|
|
} |
|
|
|
return rb.success().setData(inventoryBillDetailsVo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<AsBusrepairInventoryBillInit> init(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
AsBusrepairInventoryBillInit vo = new AsBusrepairInventoryBillInit(); |
|
|
|
AsBusrepairBillDetailsVo data = asBusrepairBillService.fetchDetailsBySid(sid).getData(); |
|
|
|
if (null != data) { |
|
|
|
vo.setSourceBillSid(sid); |
|
|
|
if (StringUtils.isNotBlank(data.getBillNo())) { |
|
|
|
vo.setSourceBillNo(data.getBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getWaitorName())) { |
|
|
|
vo.setWaitorName(data.getWaitorName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getCreateDate())) { |
|
|
|
vo.setBillDate(data.getCreateDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getBillType())) { |
|
|
|
String billType = data.getBillType(); |
|
|
|
if (billType.equals("0")) { |
|
|
|
vo.setBillType("正常工单"); |
|
|
|
} else if (billType.equals("1")) { |
|
|
|
vo.setBillType("保险理赔"); |
|
|
|
} else if (billType.equals("2")) { |
|
|
|
vo.setBillType("协议单位"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getSubject())) { |
|
|
|
vo.setSubject(data.getSubject()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getCustomerName())) { |
|
|
|
vo.setCustomerName(data.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getVehMark())) { |
|
|
|
vo.setVehMark(data.getVehMark()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getVinNo())) { |
|
|
|
vo.setVinNo(data.getVinNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(data.getCustomerOrg())) { |
|
|
|
vo.setCustomerOrg(data.getCustomerOrg()); |
|
|
|
} |
|
|
|
List<SitemVo> sitemVos = data.getSitemVos(); |
|
|
|
List<SitemsVo> sitemsVos = new ArrayList<>(); |
|
|
|
if (!sitemVos.isEmpty()) { |
|
|
|
for (SitemVo sitemVo : sitemVos) { |
|
|
|
SitemsVo sitemsVo = new SitemsVo(); |
|
|
|
BeanUtil.copyProperties(sitemVo, sitemsVo); |
|
|
|
List<String> staffNameList = sitemVo.getStaffNameList(); |
|
|
|
StringBuffer sb = new StringBuffer(); |
|
|
|
if (!staffNameList.isEmpty()) { |
|
|
|
for (String name : staffNameList) { |
|
|
|
sb.append(name).append(","); |
|
|
|
} |
|
|
|
sb.delete(sb.length() - 1, sb.length()); |
|
|
|
sitemsVo.setRepairerName(sb.toString()); |
|
|
|
} |
|
|
|
sitemsVos.add(sitemsVo); |
|
|
|
} |
|
|
|
vo.setSitemVoList(sitemsVos); |
|
|
|
} |
|
|
|
List<AsBusrepairInventorybillDetailSDto> list = new ArrayList<>(); |
|
|
|
List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid); |
|
|
|
if (!goodsDetails.isEmpty()) { |
|
|
|
for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) { |
|
|
|
AsBusrepairInventorybillDetailSDto goodsDetailsVo = new AsBusrepairInventorybillDetailSDto(); |
|
|
|
BeanUtil.copyProperties(goodsDetail, goodsDetailsVo); |
|
|
|
if (null != goodsDetail.getCount()) { |
|
|
|
goodsDetailsVo.setOutboundCount(goodsDetail.getCount().toString()); |
|
|
|
} |
|
|
|
goodsDetailsVo.setCount(""); |
|
|
|
list.add(goodsDetailsVo); |
|
|
|
} |
|
|
|
vo.setDetailList(list); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ResultBean<String> selOutBoundCount(String sourceBillSid, String busTypeKey, String goodsID) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String count = baseMapper.selOutBoundCount(sourceBillSid, busTypeKey, goodsID); |
|
|
|
return rb.success().setData(count); |
|
|
|
} |
|
|
|
} |
|
|
|
|
God
11 months ago