|
@@ -23,9 +23,10 @@ import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
+import com.ruoyi.quotation.domain.TSeaprice;
|
|
|
+import com.ruoyi.quotation.mapper.TSeapriceMapper;
|
|
|
import com.ruoyi.reportManagement.domain.TWareHouseItemsExcel;
|
|
|
import com.ruoyi.reportManagement.domain.TWhgenleg;
|
|
|
-import com.ruoyi.reportManagement.dto.TWarehousebill;
|
|
|
import com.ruoyi.reportManagement.mapper.TWhgenlegMapper;
|
|
|
import com.ruoyi.shipping.domain.TCntr;
|
|
|
import com.ruoyi.shipping.domain.TVoyage;
|
|
@@ -109,6 +110,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
private TWarehouseMapper tWarehouseMapper;
|
|
|
|
|
|
@Autowired
|
|
|
+ private TSeapriceMapper tSeapriceMapper;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
private AuditItemsMapper auditItemsMapper;
|
|
|
|
|
|
@Autowired
|
|
@@ -513,6 +517,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
|
|
|
+ warehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ warehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
if (StringUtils.isNull(warehouseBills.getfId())) {
|
|
|
// 如果是新数据
|
|
|
warehouseBills.setfBillstatus(2L);
|
|
@@ -549,7 +557,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
deleteBillsitems(fPid, tWarehousebillsitems);
|
|
|
}
|
|
|
// 库存明细添加
|
|
|
- if (StringUtils.isNotNull(tWarehousebillsitems) && !"[]".equals(tWarehousebillsitems)) {
|
|
|
+ if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
|
|
|
+ warehouseBills.setfItemsStatus(1L);
|
|
|
+ tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
+ } else {
|
|
|
JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
|
|
|
List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
|
|
|
for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
|
|
@@ -584,9 +595,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- } else {
|
|
|
- warehouseBills.setfItemsStatus(1L);
|
|
|
- tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
}
|
|
|
// 附件添加
|
|
|
if (StringUtils.isNotNull(tEnclosure) && !"[]".equals(tEnclosure)) {
|
|
@@ -1037,9 +1045,22 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
isApprove = true;
|
|
|
}
|
|
|
TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
|
|
|
+ SysConfig warehouseConfig = queryWarehouseConfig(billsType);
|
|
|
+ if (StringUtils.isNull(warehouseConfig)) {
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
+ return AjaxResult.error("系统参数异常,未找到接单审批流参数");
|
|
|
+ }
|
|
|
+ if ("0".equals(sysConfig.getConfigValue()) && (warehouseBills.getWarehouseStatus() == 4L || warehouseBills.getWarehouseStatus() == 5L)) {
|
|
|
+ return AjaxResult.error("接单审批正在进行中,无法进行提交");
|
|
|
+ }
|
|
|
warehouseBills.setfItemsStatus(4L);
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
|
|
|
+ warehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ warehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
+ warehouseBills.setfTimes(warehouseBills.getfTimes() + 1);
|
|
|
if (StringUtils.isNull(warehouseBills.getfId())) {
|
|
|
if (isApprove) {
|
|
|
warehouseBills.setfBillstatus(4L);
|
|
@@ -1058,7 +1079,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
Date time = new Date();
|
|
|
String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time);
|
|
|
warehouseBills.setfBscorpno(bscorpno);
|
|
|
- warehouseBills.setfTimes(1L);
|
|
|
tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
|
|
|
fPid = warehouseBills.getfId();
|
|
|
} else {
|
|
@@ -1069,7 +1089,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
warehouseBills.setfBillstatus(6L);
|
|
|
warehouseBills.setfReviewDate(new Date());
|
|
|
}
|
|
|
- warehouseBills.setfTimes(warehouseBills.getfTimes() + 1);
|
|
|
warehouseBills.setUpdateTime(new Date());
|
|
|
if (!"SJRK".equals(billsType)) {
|
|
|
warehouseBills.setfChargedate(warehouseBills.getfBsdate());
|
|
@@ -1341,7 +1360,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
// 主表变更状态
|
|
|
TWarehouseBills tWarehousebills = new TWarehouseBills();
|
|
|
tWarehousebills.setfId(tWarehousebillsitems1.getfPid());
|
|
|
+ Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
+ tWarehousebills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
tWarehousebills.setfItemsStatus(3L);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehousebills.getfId());
|
|
|
+ tWarehousebills.setfQty(itemInFo.getfQty());
|
|
|
+ tWarehousebills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ tWarehousebills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
int num1 = tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
|
if (num <= 0 && num1 <= 0) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
@@ -1381,8 +1406,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
warehouseBills.setfMblno(warehouseBills.getfMblno() + "/" + tWarehousebillsitems.getfMblno());
|
|
|
}
|
|
|
}
|
|
|
+ Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
+ warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
warehouseBills.setUpdateTime(new Date());
|
|
|
warehouseBills.setUpdateBy(SecurityUtils.getUsername());
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
|
|
|
+ warehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ warehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
if (StringUtils.isNull(tWarehousebillsitems.getfId())) {
|
|
|
tWarehousebillsitems.setCreateTime(new Date());
|
|
@@ -1761,6 +1792,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
}
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
|
|
|
+ warehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ warehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
// 仓库主表
|
|
|
if (StringUtils.isNull(warehouseBills.getfId())) {
|
|
|
return AjaxResult.error("请确认仓库信息是否保存");
|
|
@@ -1907,7 +1942,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
auditItems.setAuditMsg("提交");
|
|
|
auditItems.setAuditStatus("O");
|
|
|
auditItems.setFidStatus("warehouse_status");
|
|
|
- auditItems.setTimes(warehouseBills.getfTimes() + 1);
|
|
|
+ auditItems.setTimes(warehouseBills.getfTimes());
|
|
|
AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
|
|
|
String code = approvalFlow.get("code").toString();
|
|
|
if ("500".equals(code)) {
|
|
@@ -1949,9 +1984,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
warehouseBills.setfMblno(warehouseBills.getfMblno() + "/" + warehousebillsitems.getfMblno());
|
|
|
}
|
|
|
}
|
|
|
+ Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
+ warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
warehouseBills.setfItemsStatus(1L);
|
|
|
warehouseBills.setUpdateTime(new Date());
|
|
|
warehouseBills.setUpdateBy(SecurityUtils.getUsername());
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
|
|
|
+ warehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ warehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
warehousebillsitems.setfBillstatus(10L);
|
|
|
warehousebillsitems.setCreateTime(new Date());
|
|
@@ -2483,6 +2524,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
if (StringUtils.isNull(warehouseBills.getfCorpid())) {
|
|
|
return AjaxResult.error("库存明细请检查客户信息,操作终止");
|
|
|
}
|
|
|
+ warehouseBills.setfItemsStatus(4L);
|
|
|
+ warehouseBills.setUpdateTime(new Date());
|
|
|
+ warehouseBills.setUpdateBy(SecurityUtils.getUsername());
|
|
|
+ Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
+ warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
|
|
|
+ warehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ warehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
+ tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
// 查询最新明细表
|
|
|
TWarehousebillsitems warehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(tWarehousebillsitems.getfId());
|
|
|
if (StringUtils.isNull(warehousebillsitems) || warehousebillsitems.getfBillstatus() != 30L) {
|
|
@@ -2552,10 +2603,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
// 添加状态log
|
|
|
insertTWarehousebillsLog(tWarehousebillsitems, 40L, loginUser);
|
|
|
}
|
|
|
- warehouseBills.setfItemsStatus(4L);
|
|
|
- warehouseBills.setUpdateTime(new Date());
|
|
|
- warehouseBills.setUpdateBy(SecurityUtils.getUsername());
|
|
|
- tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
tEnclosureMapper.deleteByFPid(warehouseBills.getfId());
|
|
|
// 附件添加
|
|
|
if (StringUtils.isNotEmpty(attachs) && !"[]".equals(attachs)) {
|
|
@@ -2642,7 +2689,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
}
|
|
|
warehouseBills.setfItemsStatus(3L);
|
|
|
warehouseBills.setUpdateTime(new Date());
|
|
|
+ Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
+ warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
warehouseBills.setUpdateBy(SecurityUtils.getUsername());
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
|
|
|
+ warehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ warehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
tEnclosureMapper.deleteByFPid(warehouseBills.getfId());
|
|
|
// 附件添加
|
|
@@ -2796,6 +2849,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehouseBills.setUpdateTime(new Date());
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
tWarehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehouseBills.getfId());
|
|
|
+ tWarehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
|
|
|
tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
|
tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
@@ -2945,20 +3002,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehouseBills.setfItemsStatus(4L);
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
tWarehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
- if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
|
|
|
- tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
|
- tWarehouseBills.setUpdateTime(new Date());
|
|
|
- tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
|
|
|
- fPid = tWarehouseBills.getfId();
|
|
|
- } else {
|
|
|
- tWarehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
|
|
|
- tWarehouseBills.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- tWarehouseBills.setCreateTime(new Date());
|
|
|
- String billNo = billnoSerialServiceImpl.getBillNo(billsType, tWarehouseBills.getfBsdate());
|
|
|
- tWarehouseBills.setfBillno(billNo);
|
|
|
- tWarehouseBillsMapper.insertTWarehousebills(tWarehouseBills);
|
|
|
- fPid = tWarehouseBills.getfId();
|
|
|
- }
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehouseBills.getfId());
|
|
|
+ tWarehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
+ tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
|
+ tWarehouseBills.setUpdateTime(new Date());
|
|
|
+ fPid = tWarehouseBills.getfId();
|
|
|
tEnclosureMapper.deleteByFPid(fPid);
|
|
|
tWarehousebillsfeesMapper.deleteByFPid(fPid);
|
|
|
tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
|
|
@@ -3169,6 +3219,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
|
}
|
|
|
}
|
|
|
+ tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
|
|
|
map.put("fPid", fPid);
|
|
|
map.put("warehouse", tWarehouseBills);
|
|
|
map.put("warehouseItem", warehousebillsitemsList);
|
|
@@ -3215,6 +3266,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
|
tWarehouseBills.setUpdateTime(new Date());
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehouseBills.getfId());
|
|
|
+ tWarehouseBills.setfQty(itemInFo.getfQty());
|
|
|
+ tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
|
|
|
tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
|
tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
@@ -3547,6 +3602,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
/*if (billstatus && (StringUtils.isNull(warehouseFees) || "[]".equals(warehouseFees))) {
|
|
|
return AjaxResult.error("未找到应收款明细无法提交");
|
|
|
}*/
|
|
|
+ tWarehousebills.setfTimes(tWarehousebills.getfTimes() + 1);
|
|
|
if (StringUtils.isNotNull(tWarehousebills.getfId())) {
|
|
|
fPid = tWarehousebills.getfId();
|
|
|
tWarehousebills.setUpdateTime(new Date());
|
|
@@ -3617,6 +3673,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
auditItems.setAuditOpTime(new Date());
|
|
|
auditItems.setAuditMsg("提交");
|
|
|
auditItems.setAuditStatus("O");
|
|
|
+ auditItems.setFidStatus("f_billstatus");
|
|
|
+ auditItems.setTimes(tWarehousebills.getfTimes());
|
|
|
AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
|
|
|
String code = approvalFlow.get("code").toString();
|
|
|
// Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
|
|
@@ -3857,7 +3915,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehousebills.setfReviewDate(null);// 审核通过时间清空
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
tWarehousebills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
- tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehousebills.getfId());
|
|
|
+ tWarehousebills.setfQty(itemInFo.getfQty());
|
|
|
+ tWarehousebills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ tWarehousebills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(tWarehousebills.getfId(), 2L, new Date());
|
|
|
if ("JSCCF".equals(tWarehousebills.getfBilltype())) {
|
|
|
List<TWarehousebillsfees> feesList = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(fId);
|
|
@@ -3888,6 +3949,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
|
return AjaxResult.success(tWarehousebills.getfDateChanged());
|
|
|
}
|
|
|
|
|
@@ -3909,6 +3971,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehousebills.setUpdateBy(SecurityUtils.getUsername());
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
tWarehousebills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehousebills.getfId());
|
|
|
+ tWarehousebills.setfQty(itemInFo.getfQty());
|
|
|
+ tWarehousebills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ tWarehousebills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
|
return AjaxResult.success(tWarehousebills.getfDateChanged());
|
|
|
}
|
|
@@ -3920,10 +3986,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
*/
|
|
|
@Override
|
|
|
public boolean checkCode(SysCheckCode sysCheckCode) {
|
|
|
- switch (sysCheckCode.getfType()) {
|
|
|
- case "warehouse" :
|
|
|
+ String dateChanged = "";
|
|
|
+ switch (sysCheckCode.getfType()) {
|
|
|
+ case "warehouse":
|
|
|
// 查询仓储业务
|
|
|
TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(sysCheckCode.getfId());
|
|
|
+ if (StringUtils.isNull(warehouseBills)) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (StringUtils.isNotNull(sysCheckCode.getfId()) && StringUtils.isEmpty(warehouseBills.getfDateChanged())) {
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
warehouseBills.setUpdateTime(new Date());
|
|
@@ -3932,19 +4002,133 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
return true;
|
|
|
}
|
|
|
- if (StringUtils.isEmpty(sysCheckCode.getCodeVal()) && StringUtils.isNotEmpty(warehouseBills.getfDateChanged())) {
|
|
|
+ dateChanged = warehouseBills.getfDateChanged();
|
|
|
+ break;
|
|
|
+ case "freight":
|
|
|
+ // 查询运价维护业务
|
|
|
+ TSeaprice seaprice = tSeapriceMapper.selectTSeapriceById(sysCheckCode.getfId());
|
|
|
+ if (StringUtils.isNull(seaprice)) {
|
|
|
return false;
|
|
|
}
|
|
|
- // 是否符合数据库编码
|
|
|
- if (sysCheckCode.getCodeVal().equals(warehouseBills.getfDateChanged())) {
|
|
|
+ if (StringUtils.isNotNull(sysCheckCode.getfId()) && StringUtils.isEmpty(seaprice.getfDateChanged())) {
|
|
|
+ Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
+ seaprice.setUpdateTime(new Date());
|
|
|
+ seaprice.setUpdateBy(SecurityUtils.getUsername());
|
|
|
+ seaprice.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
+ tSeapriceMapper.updateTSeaprice(seaprice);
|
|
|
return true;
|
|
|
}
|
|
|
+ dateChanged = seaprice.getfDateChanged();
|
|
|
break;
|
|
|
}
|
|
|
+ if (StringUtils.isEmpty(sysCheckCode.getCodeVal()) && StringUtils.isNotEmpty(dateChanged)) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ // 是否符合数据库编码
|
|
|
+ if (sysCheckCode.getCodeVal().equals(dateChanged)) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 导入【入库明细箱信息】Excel
|
|
|
+ * @param file 文件
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public AjaxResult importLibraryInformation(MultipartFile file) {
|
|
|
+ List<TWarehousebillsitems> itemList = new ArrayList<>();
|
|
|
+
|
|
|
+ InputStream inputStream = null;
|
|
|
+ try {
|
|
|
+ inputStream = file.getInputStream();
|
|
|
+ String originalFilename = file.getOriginalFilename();
|
|
|
+ Workbook workbook = null;
|
|
|
+ if (originalFilename.endsWith("xls")) {
|
|
|
+ workbook = WorkbookFactory.create(inputStream);
|
|
|
+ } else if (originalFilename.endsWith("xlsx")) {
|
|
|
+ workbook = new XSSFWorkbook(inputStream);
|
|
|
+ }
|
|
|
+ Sheet sheet = workbook.getSheetAt(0);
|
|
|
+ int line = 0;
|
|
|
+ for (Row rows : sheet) {
|
|
|
+ line++;
|
|
|
+ if (rows.getRowNum() == 0) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ TWarehousebillsitems warehousebillsitems = new TWarehousebillsitems();
|
|
|
+ for (int a = 0; a < rows.getPhysicalNumberOfCells(); a++) {
|
|
|
+ Cell cell = rows.getCell(a);
|
|
|
+ String value = filter(sheet.getRow(0), CellReference.convertNumToColString(cell.getColumnIndex()));
|
|
|
+ switch (value) {
|
|
|
+ case "箱号":
|
|
|
+ //设置单元格类型
|
|
|
+ cell.setCellType(CellType.STRING);
|
|
|
+ if (StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
+ return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少箱号");
|
|
|
+ }
|
|
|
+ warehousebillsitems.setfCntrno(cell.getStringCellValue());
|
|
|
+ break;
|
|
|
+ /*case "铅封号":
|
|
|
+ //设置单元格类型
|
|
|
+ cell.setCellType(CellType.STRING);
|
|
|
+ if (StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
+ return AjaxResult.error("Excel箱信息数据第" + line + "箱类型");
|
|
|
+ }
|
|
|
+ companyMsg.setTypeidName(cell.getStringCellValue());
|
|
|
+ if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
|
|
|
+ Long fId = tCntrMapper.selectRcntrFId(companyMsg.getTypeidName());
|
|
|
+ companyMsg.setfTypeid(fId);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case "预计件数":
|
|
|
+ //设置单元格类型
|
|
|
+ cell.setCellType(CellType.STRING);
|
|
|
+ if (StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
+ return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少最新地点");
|
|
|
+ }
|
|
|
+ companyMsg.setAddressName((cell.getStringCellValue()));
|
|
|
+ break;
|
|
|
+ case "预计毛重":
|
|
|
+ //设置单元格类型
|
|
|
+ cell.setCellType(CellType.STRING);
|
|
|
+ if (StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
+ return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少货名");
|
|
|
+ }
|
|
|
+ companyMsg.setOwnerName(cell.getStringCellValue());
|
|
|
+ if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
|
|
|
+ String fPackageid = sysDictDataMapper.selectDictValue("f_owner", cell.getStringCellValue());
|
|
|
+ if (StringUtils.isNotEmpty(fPackageid)) {
|
|
|
+ companyMsg.setfOwner(fPackageid);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case "预计净重":
|
|
|
+ //设置单元格类型
|
|
|
+ cell.setCellType(CellType.STRING);
|
|
|
+ if (StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
+ return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少箱状态");
|
|
|
+ }
|
|
|
+ companyMsg.setCntrstatusName(cell.getStringCellValue());
|
|
|
+ if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
|
|
|
+ String setCntrstatusid = sysDictDataMapper.selectDictValue("f_cntrstatus", cell.getStringCellValue());
|
|
|
+ if (StringUtils.isNotEmpty(setCntrstatusid)) {
|
|
|
+ companyMsg.setfCntrstatus(setCntrstatusid);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;*/
|
|
|
+ }
|
|
|
+ }
|
|
|
+ itemList.add(warehousebillsitems);
|
|
|
+ }
|
|
|
+ } catch (IOException e) {
|
|
|
+ return AjaxResult.error("上传文件失败,请检查文件是否损坏");
|
|
|
+ }
|
|
|
+ return AjaxResult.success("success", itemList);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 撤销入账
|
|
|
*
|
|
|
* @param warehouseBills 主表
|
|
@@ -3969,7 +4153,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehousebills.setUpdateBy(loginUser.getUsername());
|
|
|
Long timestamp = DateUtils.getTimestamp(new Date());
|
|
|
tWarehousebills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
|
|
|
- tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
|
+ TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehousebills.getfId());
|
|
|
+ tWarehousebills.setfQty(itemInFo.getfQty());
|
|
|
+ tWarehousebills.setfNetweight(itemInFo.getfNetweight());
|
|
|
+ tWarehousebills.setfGrossweight(itemInFo.getfGrossweight());
|
|
|
tEnclosureMapper.deleteByFPid(tWarehousebills.getfId());
|
|
|
tWarehousebillsfeesMapper.deleteByFPid(tWarehousebills.getfId());
|
|
|
tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehousebills.getfId());
|
|
@@ -4159,6 +4346,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
|
}
|
|
|
}
|
|
|
+ tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
|
return AjaxResult.success(tWarehousebills.getfDateChanged());
|
|
|
}
|
|
|
|