Compare commits
23
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 王奎兴
|
4a0ac011b9 | ||
|
王奎兴
|
0363e6fdc5 | ||
|
王奎兴
|
ee873473fb | ||
|
王奎兴
|
b7233d4052 | ||
|
王奎兴
|
afc47230df | ||
|
王奎兴
|
4917dcb154 | ||
|
王奎兴
|
b136e6a55e | ||
|
王奎兴
|
1eb2f4c816 | ||
|
王奎兴
|
8ca0b289fa | ||
|
王奎兴
|
457fceb0b1 | ||
|
王奎兴
|
4f16713c03 | ||
 赵辉
|
98c4c08a8f | ||
|
赵辉
|
5170a2d96f | ||
|
赵辉
|
d1e982b9d4 | ||
|
赵辉
|
c0c75e2db0 | ||
|
赵辉
|
8f8bda4a87 | ||
|
王奎兴
|
a2e3f23798 | ||
|
王奎兴
|
7a45568be6 | ||
|
王奎兴
|
8ba0c64b62 | ||
 hjx
|
22d5a1ea3f | ||
|
hjx
|
258417cac7 | ||
|
hjx
|
a7b7e2c82d | ||
|
hjx
|
88ac989ced |
@@ -18,7 +18,7 @@ import java.util.Set;
|
|||||||
/**
|
/**
|
||||||
* bms财务结算系统feign调用接口
|
* bms财务结算系统feign调用接口
|
||||||
*/
|
*/
|
||||||
@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
||||||
public interface BmsServiceFeign {
|
public interface BmsServiceFeign {
|
||||||
|
|
||||||
|
|
||||||
@@ -35,13 +35,6 @@ public interface BmsServiceFeign {
|
|||||||
@GetMapping("/settlementCustomersApi/getInfoByCode")
|
@GetMapping("/settlementCustomersApi/getInfoByCode")
|
||||||
public AjaxResult getCustomersInfoByCode(@RequestParam("settlementCustomersCode")String settlementCustomersCode);
|
public AjaxResult getCustomersInfoByCode(@RequestParam("settlementCustomersCode")String settlementCustomersCode);
|
||||||
|
|
||||||
/**
|
|
||||||
* 按结算主体ID（如货主ID，对应 settlement_customers.settlement_entity_id）查询结算对象
|
|
||||||
*/
|
|
||||||
@GetMapping("/settlementCustomersApi/getInfoBySettlementEntityId")
|
|
||||||
AjaxResult getCustomersInfoBySettlementEntityId(@RequestParam("settlementEntityId") Long settlementEntityId,
|
|
||||||
@RequestParam(value = "topOrganizationId", required = false) Long topOrganizationId);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 推送同步业务单据
|
* 推送同步业务单据
|
||||||
@@ -56,16 +49,4 @@ public interface BmsServiceFeign {
|
|||||||
*/
|
*/
|
||||||
@GetMapping("/documentTypeApi/getDocumentInfoByCodeSet")
|
@GetMapping("/documentTypeApi/getDocumentInfoByCodeSet")
|
||||||
AjaxResult getDocumentInfoByCodeSet(@RequestParam("documentTypeCodeSet") Set<String> documentTypeCodeSet);
|
AjaxResult getDocumentInfoByCodeSet(@RequestParam("documentTypeCodeSet") Set<String> documentTypeCodeSet);
|
||||||
|
}
|
||||||
/**
|
|
||||||
* 定时任务整租推送到bms
|
|
||||||
*/
|
|
||||||
@PostMapping("/businessDocumentApi/wholeRentSynchronization")
|
|
||||||
public AjaxResult businessDocumentApiSave(@RequestBody BusinessDataPushDTO businessDataPushDTO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 定时任务整租推送到bms
|
|
||||||
*/
|
|
||||||
@PostMapping("/businessDocumentApi/wholeRentSynchronizationZXF")
|
|
||||||
public AjaxResult wholeRentSynchronizationZXF(@RequestBody BusinessDataPushDTO businessDataPushDTO);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
package com.mhd.system.api;
|
|
||||||
|
|
||||||
import com.mhd.common.core.constant.ServiceNameConstants;
|
|
||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
|
||||||
import com.mhd.system.api.domain.*;
|
|
||||||
import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory;
|
|
||||||
import com.mhd.system.api.factory.RemoteOmsFeignFallbackFactory;
|
|
||||||
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.scheduling.annotation.Async;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
|
||||||
public interface OmsServiceFeign {
|
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("wms推送入库单")
|
|
||||||
@PostMapping(value = "/reservationStockInOrderApi/pushInOrder")
|
|
||||||
public AjaxResult pushInOrder(@RequestBody StockInOrderTZPD stockInOrder);
|
|
||||||
|
|
||||||
@ApiOperation("wms推送入库单明细")
|
|
||||||
@PostMapping(value = "/reservationStockInOrderApi/pushInOrderDetail")
|
|
||||||
public AjaxResult pushInOrderDetail(@RequestBody InMaterialDetailTZPD inMaterialDetail);
|
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("wms推送入库单")
|
|
||||||
@PostMapping(value = "/reservationStockOutOrderApi/pushOutOrder")
|
|
||||||
public AjaxResult pushOutOrder(@RequestBody StockOutOrderTZPD stockOutOrder);
|
|
||||||
|
|
||||||
@ApiOperation("wms推送入库单明细")
|
|
||||||
@PostMapping(value = "/reservationStockOutOrderApi/pushOutOrderDetail")
|
|
||||||
public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetailTZPD outMaterialDetail);
|
|
||||||
|
|
||||||
@ApiOperation("编辑物料库存")
|
|
||||||
@PostMapping("/reservationMaterialInventoryApi/omsEdit")
|
|
||||||
@Async
|
|
||||||
public CompletableFuture<Void> omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO);
|
|
||||||
|
|
||||||
@ApiOperation("查询企业单位列表-新增物料时显示下拉框数据")
|
|
||||||
@GetMapping("/erpEnterpriseUnitApi/unitList")
|
|
||||||
public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO);
|
|
||||||
|
|
||||||
//查询企业国别列表-新增物料时显示下拉框数据
|
|
||||||
@ApiOperation("查询企业国别列表-新增物料时显示下拉框数据")
|
|
||||||
@GetMapping("/erpCountryApi/countryList")
|
|
||||||
public AjaxResult getCountryList(ErpCountryDTO erpCountryDTO);
|
|
||||||
|
|
||||||
@ApiOperation("保存gwlog")
|
|
||||||
@PostMapping("/gwLogApi/saveGwLog")
|
|
||||||
AjaxResult insertGwLog(@RequestBody GwLogDTO gwLogDTO);
|
|
||||||
|
|
||||||
@ApiOperation("修改gwlog")
|
|
||||||
@PostMapping("/gwLogApi/updateGwLog")
|
|
||||||
AjaxResult updateGwLog(@RequestBody GwLogDTO gwLogDTO);
|
|
||||||
|
|
||||||
@ApiOperation("批量推送")
|
|
||||||
@PostMapping("/reservationStockOutOrderApi/batchPush")
|
|
||||||
public AjaxResult batchPush(@RequestBody List<Long> idList);
|
|
||||||
|
|
||||||
@ApiOperation("批量推送")
|
|
||||||
@PostMapping("/reservationStockOutOrderApi/batchPushByNumber")
|
|
||||||
public AjaxResult batchPushByNumber(@RequestBody List<String> numberList);
|
|
||||||
}
|
|
||||||
@@ -201,13 +201,6 @@ public interface SystemServiceFeign {
|
|||||||
@GetMapping("/batchApi/getInfo/{batchId}")
|
@GetMapping("/batchApi/getInfo/{batchId}")
|
||||||
public AjaxResult getBatchInfoByBatchId(@PathVariable("batchId") Long batchId);
|
public AjaxResult getBatchInfoByBatchId(@PathVariable("batchId") Long batchId);
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据批次名称查询批次列表（导入用）
|
|
||||||
*/
|
|
||||||
@GetMapping("/batchApi/list")
|
|
||||||
public Object getBatchListByName(@RequestParam("batchName") String batchName,
|
|
||||||
@RequestParam("organizationId") Long organizationId);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据batchId获取对应批次详情信息
|
* 根据batchId获取对应批次详情信息
|
||||||
*/
|
*/
|
||||||
@@ -225,12 +218,6 @@ public interface SystemServiceFeign {
|
|||||||
@GetMapping("/associationWarehouseApi/getWarehouseInfo/{correlationId}")
|
@GetMapping("/associationWarehouseApi/getWarehouseInfo/{correlationId}")
|
||||||
public AjaxResult getWarehouseInfo(@PathVariable("correlationId") Long correlationId);
|
public AjaxResult getWarehouseInfo(@PathVariable("correlationId") Long correlationId);
|
||||||
|
|
||||||
/**
|
|
||||||
* 直接从数据库获取指定用户设置的仓库（不使用缓存）
|
|
||||||
*/
|
|
||||||
@GetMapping("/associationWarehouseApi/getWarehouseInfoFromDb/{correlationId}")
|
|
||||||
public AjaxResult getWarehouseInfoFromDb(@PathVariable("correlationId") Long correlationId);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据warehouseId获取对仓库信息
|
* 根据warehouseId获取对仓库信息
|
||||||
*/
|
*/
|
||||||
@@ -258,14 +245,6 @@ public interface SystemServiceFeign {
|
|||||||
@GetMapping("/packApi/getInfoByPackIdAndUnitCode/{packId}/{unitCode}")
|
@GetMapping("/packApi/getInfoByPackIdAndUnitCode/{packId}/{unitCode}")
|
||||||
public AjaxResult getInfoByPackIdAndUnitCode(@PathVariable("packId") Long packId, @PathVariable("unitCode") String unitCode);
|
public AjaxResult getInfoByPackIdAndUnitCode(@PathVariable("packId") Long packId, @PathVariable("unitCode") String unitCode);
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据包装编码/名称查询包装（导入用）
|
|
||||||
*/
|
|
||||||
@GetMapping("/packApi/list")
|
|
||||||
public Object getPackList(@RequestParam(value = "packCode", required = false) String packCode,
|
|
||||||
@RequestParam(value = "packName", required = false) String packName,
|
|
||||||
@RequestParam(value = "organizationId", required = false) Long organizationId);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据platformId获取对应月台信息
|
* 根据platformId获取对应月台信息
|
||||||
*/
|
*/
|
||||||
@@ -309,12 +288,6 @@ public interface SystemServiceFeign {
|
|||||||
@GetMapping("/expenseAccountApi/getInfoByCode")
|
@GetMapping("/expenseAccountApi/getInfoByCode")
|
||||||
public AjaxResult getSubInfoByCode(@RequestParam("subjectCode") String subjectCode);
|
public AjaxResult getSubInfoByCode(@RequestParam("subjectCode") String subjectCode);
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据code编码查询费用科目
|
|
||||||
*/
|
|
||||||
@GetMapping("/expenseAccountApi/getInfoByCode2")
|
|
||||||
public AjaxResult getSubInfoByCode2(@RequestParam("subjectCode") String subjectCode,@RequestParam("topOrganizationId") Long topOrganizationId);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据code编码查询项目信息
|
* 根据code编码查询项目信息
|
||||||
@@ -346,38 +319,13 @@ public interface SystemServiceFeign {
|
|||||||
@GetMapping("/contractManageApi/getInfoByCode")
|
@GetMapping("/contractManageApi/getInfoByCode")
|
||||||
public AjaxResult getInfoByCode(@RequestParam("contractNumber") String contractNumber);
|
public AjaxResult getInfoByCode(@RequestParam("contractNumber") String contractNumber);
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取通用合同
|
|
||||||
*/
|
|
||||||
@GetMapping("/contractManageApi/getGeneralContract")
|
|
||||||
public AjaxResult getGeneralContract();
|
|
||||||
/**
|
/**
|
||||||
* 根据结算主体获取合同信息
|
* 根据结算主体获取合同信息
|
||||||
*/
|
*/
|
||||||
@GetMapping("/contractManageApi/getInfoByCustomer")
|
@GetMapping("/contractManageApi/getInfoByCustomer")
|
||||||
public AjaxResult getInfoByCustomer(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType);
|
public AjaxResult getInfoByCustomer(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType);
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据结算主体获取合同信息
|
|
||||||
*/
|
|
||||||
@GetMapping("/contractManageApi/getInfoByCustomer2")
|
|
||||||
public AjaxResult getInfoByCustomer2(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType,@RequestParam("topOrganizationId") Long topOrganizationId);
|
|
||||||
|
|
||||||
@GetMapping("/contractManageApi/getInfoByCustomerAndOrganizationId")
|
|
||||||
public AjaxResult getInfoByCustomerAndOrganizationId(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType,@RequestParam("topOrganizationId") Long topOrganizationId,@RequestParam("organizationId") Long organizationId);
|
|
||||||
|
|
||||||
@GetMapping("/contractManageApi/queryList")
|
@GetMapping("/contractManageApi/queryList")
|
||||||
public AjaxResult queryList();
|
public AjaxResult queryList();
|
||||||
|
|
||||||
@GetMapping("/LeaseApi/wholeRentSynchronization")
|
}
|
||||||
public AjaxResult wholeRentSynchronization();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料主数据导入：按组织与关键词匹配物料分类，返回体含物料分类的 code 字段，供写入 material_base_info.material_classify_code。
|
|
||||||
* 使用 basicApi 前缀，与 WMS 其他 Feign 调 system 的惯例一致（避免仅重启 WMS 时 system 上无 materialClassifyApi 新路由导致 404）。
|
|
||||||
*/
|
|
||||||
@GetMapping("/basicApi/matchMaterialClassifyForImport")
|
|
||||||
public AjaxResult matchForMaterialImport(@RequestParam("keyword") String keyword,
|
|
||||||
@RequestParam("organizationId") Long organizationId);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -9,20 +9,15 @@ import com.mhd.common.core.domain.dto.UserDriverDTO;
|
|||||||
import com.mhd.common.core.domain.entity.R;
|
import com.mhd.common.core.domain.entity.R;
|
||||||
import com.mhd.common.core.domain.todo.StatisticalMattersDo;
|
import com.mhd.common.core.domain.todo.StatisticalMattersDo;
|
||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
import com.mhd.common.core.web.domain.AjaxResult;
|
||||||
import com.mhd.common.core.web.page.TableDataInfo;
|
|
||||||
import com.mhd.system.api.domain.UserDTO;
|
import com.mhd.system.api.domain.UserDTO;
|
||||||
import com.mhd.system.api.domain.UserShipperFeignDTO;
|
|
||||||
import com.mhd.system.api.domain.UserShipperQueryDTO;
|
|
||||||
import com.mhd.system.api.domain.UserUpdateDTO;
|
import com.mhd.system.api.domain.UserUpdateDTO;
|
||||||
import com.mhd.system.api.factory.RemoteUserFeignFallbackFactory;
|
import com.mhd.system.api.factory.RemoteUserFeignFallbackFactory;
|
||||||
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
||||||
import com.mhd.system.api.model.LoginUser;
|
import com.mhd.system.api.model.LoginUser;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.cloud.openfeign.SpringQueryMap;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -196,31 +191,4 @@ public interface UserServiceFeign {
|
|||||||
@ApiOperation("根据用户ID查询货主信息")
|
@ApiOperation("根据用户ID查询货主信息")
|
||||||
@GetMapping("/userShipperApi/getShipperByUserId/{userId}")
|
@GetMapping("/userShipperApi/getShipperByUserId/{userId}")
|
||||||
public AjaxResult<?> getShipperByUserId(@PathVariable("userId") Long userId);
|
public AjaxResult<?> getShipperByUserId(@PathVariable("userId") Long userId);
|
||||||
|
|
||||||
@ApiOperation("设置路线")
|
|
||||||
@PostMapping("/userApi/updateLineManagement")
|
|
||||||
public AjaxResult updateLineManagement(@RequestBody UserDTO userDTO);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("商业合作伙伴-分页查询托运人列表")
|
|
||||||
@GetMapping("/userShipperApi/userShipperList")
|
|
||||||
public TableDataInfo userShipperList(@SpringQueryMap UserShipperQueryDTO userShipperQueryDTO);
|
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/userShipperApi/updatePushStatus")
|
|
||||||
public AjaxResult<?> updatePushStatus(@RequestParam(value = "shipperId") Long shipperId,
|
|
||||||
@RequestParam(value = "pushStatus", required = false) Integer pushStatus,
|
|
||||||
@RequestParam(value = "pushTime", required = false) String pushTime,
|
|
||||||
@RequestParam(value = "pushBy", required = false) Long pushBy,
|
|
||||||
@RequestParam(value = "pushByName", required = false) String pushByName,
|
|
||||||
@RequestParam(value = "organizationId") Long organizationId);
|
|
||||||
|
|
||||||
@PostMapping("/userShipperApi/getCustomerNcCodeBatch")
|
|
||||||
AjaxResult getCustomerNcCodeBatch(@RequestBody List<Long> shipperIdList);
|
|
||||||
|
|
||||||
@ApiOperation("查询赊销额度")
|
|
||||||
@PostMapping("/userShipperApi/querySaleCreditLimitFeign")
|
|
||||||
public AjaxResult querySaleCreditLimitFeign(@RequestBody UserShipperFeignDTO userShipperDTO);
|
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,6 @@ import com.mhd.common.core.domain.po.UserPo;
|
|||||||
import com.mhd.common.core.utils.sms.Result;
|
import com.mhd.common.core.utils.sms.Result;
|
||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
import com.mhd.common.core.web.domain.AjaxResult;
|
||||||
import com.mhd.system.api.domain.*;
|
import com.mhd.system.api.domain.*;
|
||||||
import com.mhd.system.api.domain.TmsOrderAddDTO;
|
|
||||||
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
@@ -26,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class)
|
@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,configuration = FeignAutoConfiguration.class)
|
||||||
public interface WlhyServiceFeign {
|
public interface WlhyServiceFeign {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -517,14 +516,6 @@ public interface WlhyServiceFeign {
|
|||||||
@PostMapping(value = "/feign/outBoundSummary/getOrderListByReconciliation")
|
@PostMapping(value = "/feign/outBoundSummary/getOrderListByReconciliation")
|
||||||
public R<List<TmsOrder>> getOrderListByReconciliation(@RequestBody ReconciliationDTO reconciliationDTO);
|
public R<List<TmsOrder>> getOrderListByReconciliation(@RequestBody ReconciliationDTO reconciliationDTO);
|
||||||
|
|
||||||
@ApiOperation(value = "查询对账单对应的发票明细", notes = "查询对账单对应的发票明细")
|
|
||||||
@PostMapping(value = "/feign/outBoundSummary/selectMakeOutInvoiceListByReconciliation")
|
|
||||||
public R<List<TmsMakeOutInvoice>> selectMakeOutInvoiceListByReconciliation(@RequestBody ReconciliationDTO reconciliationDTO);
|
|
||||||
|
|
||||||
@ApiOperation(value = "查询对账单对应的发票明细子项", notes = "查询对账单对应的发票明细子项")
|
|
||||||
@PostMapping(value = "/feign/outBoundSummary/selectMakeOutInvoiceItemList")
|
|
||||||
public R<List<TmsMakeOutInvoiceItem>> selectMakeOutInvoiceItemList(@RequestBody TmsMakeOutInvoice tmsMakeOutInvoice);
|
|
||||||
|
|
||||||
@GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryById")
|
@GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryById")
|
||||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id);
|
public Result<?> queryById(@RequestParam(name="id",required=true) String id);
|
||||||
|
|
||||||
@@ -538,20 +529,4 @@ public interface WlhyServiceFeign {
|
|||||||
|
|
||||||
@GetMapping("/feign/order/cancelIssueDocuments")
|
@GetMapping("/feign/order/cancelIssueDocuments")
|
||||||
public AjaxResult cancelIssueDocuments(@RequestParam(name="executeOrderId") String executeOrderId);
|
public AjaxResult cancelIssueDocuments(@RequestParam(name="executeOrderId") String executeOrderId);
|
||||||
|
}
|
||||||
@GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryList")
|
|
||||||
public AjaxResult<?> queryList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
||||||
@RequestParam(name="pushStatus", required = false) String pushStatus,
|
|
||||||
@RequestParam(name="organizationId", required = false) String organizationId);
|
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("汇率-更新推送状态")
|
|
||||||
@PostMapping("/ntocc/tmsSettlementExchangeRate/updatePushStatus")
|
|
||||||
void updateExchangeRatePushStatus(@RequestParam("id") String id,
|
|
||||||
@RequestParam("pushStatus") Integer pushStatus,
|
|
||||||
@RequestParam(name="pushTime",required = false) String pushTime,
|
|
||||||
@RequestParam(name="pushBy",required = false) Long pushBy,
|
|
||||||
@RequestParam(name="pushByName",required = false) String pushByName,
|
|
||||||
@RequestParam("organizationId") String organizationId);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,16 +2,14 @@ package com.mhd.system.api;
|
|||||||
|
|
||||||
import com.mhd.common.core.constant.ServiceNameConstants;
|
import com.mhd.common.core.constant.ServiceNameConstants;
|
||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
import com.mhd.common.core.web.domain.AjaxResult;
|
||||||
import com.mhd.common.core.web.page.TableDataInfo;
|
import com.mhd.system.api.domain.MaterialBaseInfoFeign;
|
||||||
import com.mhd.system.api.domain.*;
|
import com.mhd.system.api.domain.MaterialInventoryDTO;
|
||||||
import com.mhd.system.api.factory.RemoteWmsFallbackFactory;
|
import com.mhd.system.api.domain.NoticeOrderDTO;
|
||||||
|
import com.mhd.system.api.factory.RemoteTicketFeignFallbackFactory;
|
||||||
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.cloud.openfeign.SpringQueryMap;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -20,7 +18,7 @@ import java.util.Map;
|
|||||||
* @description: TODO
|
* @description: TODO
|
||||||
* @date 2024/5/10 8:58
|
* @date 2024/5/10 8:58
|
||||||
**/
|
**/
|
||||||
@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
@FeignClient(contextId = "remoteWmsServiceFeign", value = ServiceNameConstants.WMS_SERVICE, fallbackFactory = RemoteTicketFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
||||||
public interface WmsServiceFeign {
|
public interface WmsServiceFeign {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -66,53 +64,5 @@ public interface WmsServiceFeign {
|
|||||||
* 查询物料库存列表不分页
|
* 查询物料库存列表不分页
|
||||||
*/
|
*/
|
||||||
@GetMapping("/materialInventoryApi/listAll")
|
@GetMapping("/materialInventoryApi/listAll")
|
||||||
public AjaxResult materialInventoryApiListAll(@SpringQueryMap MaterialInventoryDTO materialInventoryDTO);
|
public AjaxResult materialInventoryApiListAll(MaterialInventoryDTO materialInventoryDTO);
|
||||||
|
}
|
||||||
/**
|
|
||||||
* oms下发单保存
|
|
||||||
*/
|
|
||||||
@ApiOperation("oms下发单保存")
|
|
||||||
@PostMapping(value = "/stockOutOrderApi/omsOutOrderAdd")
|
|
||||||
public void omsOutOrderAdd(@RequestBody StockOutOrder stockOutOrder);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* oms下发单明细保存
|
|
||||||
*/
|
|
||||||
@ApiOperation("oms下发单明细保存")
|
|
||||||
@PostMapping(value = "/stockOutOrderApi/omsOutOrderAddDetail")
|
|
||||||
public void omsOutOrderAddDetail(@RequestBody List<OutMaterialDetail> outMaterialDetails);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* oms下发单明细保存
|
|
||||||
*/
|
|
||||||
@ApiOperation("oms下发单明细保存")
|
|
||||||
@PostMapping(value = "/stockOutOrderApi/omsOutOrderAddDeliveryDetailsLink")
|
|
||||||
public void omsOutOrderAddDeliveryDetailsLink(@RequestBody List<DeliveryDetailsLink> deliveryDetailsLinks);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* oms下发单保存
|
|
||||||
*/
|
|
||||||
@ApiOperation("oms下发单保存")
|
|
||||||
@PostMapping(value = "/stockInOrderApi/omsInOrderAdd")
|
|
||||||
public void omsInOrderAdd(@RequestBody StockInOrder stockInOrder);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* oms下发单明细保存
|
|
||||||
*/
|
|
||||||
@ApiOperation("oms下发单明细保存")
|
|
||||||
@PostMapping(value = "/stockInOrderApi/omsInOrderAddDetail")
|
|
||||||
public void omsInOrderAddDetail(@RequestBody List<InMaterialDetail> inMaterialDetails);
|
|
||||||
|
|
||||||
@ApiOperation("oms查询物料列表")
|
|
||||||
@GetMapping("/materialBaseInfoApi/queryList")
|
|
||||||
public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO);
|
|
||||||
|
|
||||||
@ApiOperation("oms物料列表推送-更新推送信息")
|
|
||||||
@PostMapping("/materialBaseInfoApi/updatePushStatus")
|
|
||||||
public AjaxResult<?> updateMaterialPushStatus(@RequestParam("materialBaseInfoId") Long materialBaseInfoId,
|
|
||||||
@RequestParam("pushStatus") Integer pushStatus,
|
|
||||||
@RequestParam(value = "pushTime",required = false) String pushTime,
|
|
||||||
@RequestParam(value = "pushBy",required = false) Long pushBy,
|
|
||||||
@RequestParam(value = "pushByName",required = false) String pushByName);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
package com.mhd.system.api;
|
|
||||||
|
|
||||||
import com.mhd.common.core.constant.ServiceNameConstants;
|
|
||||||
import com.mhd.common.core.domain.entity.R;
|
|
||||||
import com.mhd.common.core.domain.dto.YmsSysUserDTO;
|
|
||||||
import com.mhd.system.api.domain.YmsLoginUser;
|
|
||||||
import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory;
|
|
||||||
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
|
|
||||||
@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", configuration = FeignAutoConfiguration.class)
|
|
||||||
public interface YmsServiceFeign {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取YMS用户基本信息
|
|
||||||
* @param szwlUserId 数字物流用户ID
|
|
||||||
* @return YMS登录用户基本信息
|
|
||||||
*/
|
|
||||||
@GetMapping("/system/user/inner/getYmsUserInfo/{szwlUserId}")
|
|
||||||
R<YmsLoginUser> getYmsUserInfo(@PathVariable("szwlUserId") Long szwlUserId);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取用户详细信息
|
|
||||||
* @param userId 用户ID
|
|
||||||
* @return 用户信息
|
|
||||||
*/
|
|
||||||
@GetMapping("/system/user/inner/info/{userId}")
|
|
||||||
R<Long> innerGetInfo(@PathVariable("userId") Long userId);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增用户
|
|
||||||
* @param ymsSysUserDTO 用户信息
|
|
||||||
* @return 新增结果
|
|
||||||
*/
|
|
||||||
@PostMapping("/system/user/inner/add")
|
|
||||||
R<Object> innerAdd(@RequestBody YmsSysUserDTO ymsSysUserDTO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改用户
|
|
||||||
* @param ymsSysUserDTO 用户信息
|
|
||||||
* @return 修改结果
|
|
||||||
*/
|
|
||||||
@PutMapping("/system/user/inner/edit")
|
|
||||||
R<Object> innerEdit(@RequestBody YmsSysUserDTO ymsSysUserDTO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除用户
|
|
||||||
* @param userIds 用户ID数组
|
|
||||||
* @return 删除结果
|
|
||||||
*/
|
|
||||||
@DeleteMapping("/system/user/inner/remove/{userIds}")
|
|
||||||
R<Object> innerRemove(@PathVariable("userIds") Long[] userIds);
|
|
||||||
|
|
||||||
}
|
|
||||||
-50
@@ -1,50 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
//package com.mhd.wms.domain.deliveryDetailsLink.entity;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class DeliveryDetailsLink extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("编号")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long id;
|
|
||||||
@ApiModelProperty("oms编号")
|
|
||||||
private Long omsId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "业务单id")
|
|
||||||
private Long orderId;
|
|
||||||
@ApiModelProperty(value = "业务单号")
|
|
||||||
private String orderNumber;
|
|
||||||
@ApiModelProperty(value = "退货入库单号")
|
|
||||||
private String returnOrderNumber;
|
|
||||||
@ApiModelProperty(value = "类别")
|
|
||||||
private String category;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "发票编号")
|
|
||||||
private String invoiceNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "客户编号")
|
|
||||||
private String customerNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "配送名称")
|
|
||||||
private String deliveryName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "箱")
|
|
||||||
private Integer box;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "包")
|
|
||||||
private Integer bag;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "金额")
|
|
||||||
private BigDecimal amount;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@ApiModel(description = "企业国别DTO")
|
|
||||||
public class ErpCountryDTO {
|
|
||||||
|
|
||||||
@ApiModelProperty("主键id")
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@ApiModelProperty("ERP国别编码")
|
|
||||||
private String erpCountryCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("ERP国别名称")
|
|
||||||
private String erpCountryName;
|
|
||||||
|
|
||||||
@ApiModelProperty("所属组织ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
}
|
|
||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@ApiModel(description = "企业单位DTO")
|
|
||||||
public class ErpEnterpriseUnitDTO {
|
|
||||||
|
|
||||||
@ApiModelProperty("企业单位id")
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@ApiModelProperty("企业单位名称")
|
|
||||||
private String erpName;
|
|
||||||
|
|
||||||
@ApiModelProperty("企业单位编码")
|
|
||||||
private String erpCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织ID")
|
|
||||||
private Long organizationId;
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class GwLogDTO {
|
|
||||||
|
|
||||||
@ApiModelProperty("日志id")
|
|
||||||
private Long logId;
|
|
||||||
|
|
||||||
@ApiModelProperty("类型")
|
|
||||||
private String type;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务ID")
|
|
||||||
private Long businessId;
|
|
||||||
|
|
||||||
@ApiModelProperty("请求报文")
|
|
||||||
private String requestBody;
|
|
||||||
|
|
||||||
@ApiModelProperty("响应报文")
|
|
||||||
private String responseBody;
|
|
||||||
|
|
||||||
@ApiModelProperty("状态（1-初始，2-成功，3-失败）")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@ApiModelProperty("错误信息")
|
|
||||||
private String errorMsg;
|
|
||||||
|
|
||||||
@ApiModelProperty("推送时间")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date sendTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("创建人")
|
|
||||||
private Long createBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("创建时间")
|
|
||||||
private Date createTime;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class GwLogW implements Serializable {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("日志id")
|
|
||||||
private Long logId;
|
|
||||||
|
|
||||||
@ApiModelProperty("类型")
|
|
||||||
private String type;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务ID")
|
|
||||||
private Long businessId;
|
|
||||||
|
|
||||||
@ApiModelProperty("请求报文")
|
|
||||||
private String requestBody;
|
|
||||||
|
|
||||||
@ApiModelProperty("响应报文")
|
|
||||||
private String responseBody;
|
|
||||||
|
|
||||||
@ApiModelProperty("状态（1-初始，2-成功，3-失败）")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@ApiModelProperty("错误信息")
|
|
||||||
private String errorMsg;
|
|
||||||
|
|
||||||
@ApiModelProperty("推送时间")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date sendTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("创建人")
|
|
||||||
private Long createBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("创建时间")
|
|
||||||
private Date createTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("删除标记：1-正常，0-删除")
|
|
||||||
private Integer delFlag;
|
|
||||||
|
|
||||||
// @ApiModelProperty("推送人姓名")
|
|
||||||
// private String pushByName;
|
|
||||||
}
|
|
||||||
@@ -1,379 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
||||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料明细对象 material_detail
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-21
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class InMaterialDetail extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单物料明细id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long materialDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务唯一id")
|
|
||||||
@JsonSerialize(using = ToStringSerializer.class)
|
|
||||||
private Long uniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单号")
|
|
||||||
@Excel(name = "入库单号")
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料基础信息id")
|
|
||||||
@Excel(name = "物料基础信息id")
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料编码")
|
|
||||||
@Excel(name = "物料编码")
|
|
||||||
private String materialCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料名称")
|
|
||||||
@Excel(name = "物料名称")
|
|
||||||
private String materialName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料条形码")
|
|
||||||
@Excel(name = "物料条形码")
|
|
||||||
private String barCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("收货数量")
|
|
||||||
@Excel(name = "收货数量")
|
|
||||||
private BigDecimal receiptQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架数量")
|
|
||||||
@Excel(name = "上架数量")
|
|
||||||
private BigDecimal shelvesQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("作业数量（例如：收货数量 上架数量）")
|
|
||||||
@Excel(name = "作业数量（例如：收货数量 上架数量）")
|
|
||||||
private BigDecimal actualQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("收货状态: 1-待收货 2-收货中 3-已收货 4-已收货（少收） 5-已收货（超收）")
|
|
||||||
@Excel(name = "收货状态: 1-待收货 2-收货中 3-已收货 4-已收货（少收） 5-已收货（超收）")
|
|
||||||
private Integer receiptStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架状态: 1-待上架 2-上架中 3-已上架 4-已上架（少上） 5-已上架（超上）")
|
|
||||||
@Excel(name = "上架状态: 1-待上架 2-上架中 3-已上架 4-已上架（少上） 5-已上架（超上）")
|
|
||||||
private Integer shelvesStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格id")
|
|
||||||
@Excel(name = "包装规格id")
|
|
||||||
private Long packId;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格编码")
|
|
||||||
@Excel(name = "包装规格编码")
|
|
||||||
private String packCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格名称")
|
|
||||||
@Excel(name = "包装规格名称")
|
|
||||||
private String packName;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装详情id")
|
|
||||||
@Excel(name = "包装详情id")
|
|
||||||
private Long packDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位代码：EA IP CS PL OT")
|
|
||||||
@Excel(name = "单位代码：EA IP CS PL OT")
|
|
||||||
private String unitCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位名称")
|
|
||||||
@Excel(name = "单位名称")
|
|
||||||
private String unitName;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位数量")
|
|
||||||
@Excel(name = "单位数量")
|
|
||||||
private BigDecimal unitNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料仓库控制信息id")
|
|
||||||
@Excel(name = "物料仓库控制信息id")
|
|
||||||
private Long materialWarehouseControlId;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否序列号管理: 1-是 2-否")
|
|
||||||
@Excel(name = "是否序列号管理: 1-是 2-否")
|
|
||||||
private Integer serialNumberManage;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否质检管理: 1-是 2-否")
|
|
||||||
@Excel(name = "是否质检管理: 1-是 2-否")
|
|
||||||
private Integer qualityInspectionManage;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检阶段: 1-收货前 2-收货后上架前")
|
|
||||||
@Excel(name = "质检阶段: 1-收货前 2-收货后上架前")
|
|
||||||
private Integer qualityInspectionStage;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检规则: 1-全检 2-抽检 ")
|
|
||||||
@Excel(name = "质检规则: 1-全检 2-抽检 ")
|
|
||||||
private Integer qualityInspectionRule;
|
|
||||||
|
|
||||||
@ApiModelProperty("抽检比例")
|
|
||||||
@Excel(name = "抽检比例")
|
|
||||||
private BigDecimal qualityInspectionRatio;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检项: 1-包装 2-纯度")
|
|
||||||
@Excel(name = "质检项: 1-包装 2-纯度")
|
|
||||||
private Integer qualityInspectionTerm;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检结果: 1-正常 2-异常")
|
|
||||||
@Excel(name = "质检结果: 1-正常 2-异常")
|
|
||||||
private Integer qualityInspectionResults;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否允许超收: 1-是 2-否")
|
|
||||||
@Excel(name = "是否允许超收: 1-是 2-否")
|
|
||||||
private Integer allowOvercharge;
|
|
||||||
|
|
||||||
@ApiModelProperty("超收比例")
|
|
||||||
@Excel(name = "超收比例")
|
|
||||||
private BigDecimal overchargeRatio;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次号")
|
|
||||||
@Excel(name = "批次号")
|
|
||||||
private String batchNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态编码")
|
|
||||||
@Excel(name = "物料状态编码")
|
|
||||||
private String materialStatusCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态名称")
|
|
||||||
@Excel(name = "物料状态名称")
|
|
||||||
private String materialStatusName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配规则id")
|
|
||||||
@Excel(name = "分配规则id")
|
|
||||||
private Long distributeRuleId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配规则编码")
|
|
||||||
@Excel(name = "分配规则编码")
|
|
||||||
private String distributeRuleCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配规则名称")
|
|
||||||
@Excel(name = "分配规则名称")
|
|
||||||
private String distributeRuleName;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器id")
|
|
||||||
@Excel(name = "容器id")
|
|
||||||
private Long containerId;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器编码")
|
|
||||||
@Excel(name = "容器编码")
|
|
||||||
private String containerCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型 数据字典")
|
|
||||||
@Excel(name = "容器类型 数据字典")
|
|
||||||
private String containerType;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型名称 数据字典")
|
|
||||||
@Excel(name = "容器类型名称 数据字典")
|
|
||||||
private String containerTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架仓库编码")
|
|
||||||
@Excel(name = "上架仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库区id")
|
|
||||||
@Excel(name = "上架库区id")
|
|
||||||
private Long storageSectionId;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库区编码")
|
|
||||||
@Excel(name = "上架库区编码")
|
|
||||||
private String storageCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库区名称")
|
|
||||||
@Excel(name = "上架库区名称")
|
|
||||||
private String storageName;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库位id")
|
|
||||||
@Excel(name = "上架库位id")
|
|
||||||
private Long storageLocationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库位编码")
|
|
||||||
@Excel(name = "上架库位编码")
|
|
||||||
private String storageLocationCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库位名称")
|
|
||||||
@Excel(name = "上架库位名称")
|
|
||||||
private String storageLocationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("层级深度，从一级开始递增")
|
|
||||||
private Integer level;
|
|
||||||
|
|
||||||
@ApiModelProperty("父级唯一Id")
|
|
||||||
private Long parentUniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
// ========== 报关相关明细字段 ==========
|
|
||||||
@ApiModelProperty("规格型号")
|
|
||||||
@Excel(name = "规格型号/ITEM")
|
|
||||||
private String specificationModel;
|
|
||||||
|
|
||||||
@ApiModelProperty("SKU码")
|
|
||||||
@Excel(name = "SKU码")
|
|
||||||
private String skuCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("Invoice No.")
|
|
||||||
@Excel(name = "Invoice No.")
|
|
||||||
private String invoiceNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("升")
|
|
||||||
@Excel(name = "升")
|
|
||||||
private BigDecimal liter;
|
|
||||||
|
|
||||||
@ApiModelProperty("尺寸")
|
|
||||||
@Excel(name = "尺寸")
|
|
||||||
private String dimensions;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报单位")
|
|
||||||
@Excel(name = "申报单位")
|
|
||||||
private String declarationUnit;
|
|
||||||
|
|
||||||
@ApiModelProperty("Batch Ref NO's")
|
|
||||||
@Excel(name = "Batch Ref NO's")
|
|
||||||
private String batchRefNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("Sheet Ref NO's")
|
|
||||||
@Excel(name = "Sheet Ref NO's")
|
|
||||||
private String sheetRefNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("原产国")
|
|
||||||
@Excel(name = "原产国")
|
|
||||||
private String originCountry;
|
|
||||||
|
|
||||||
@ApiModelProperty("箱号/卡板号")
|
|
||||||
@Excel(name = "箱号/卡板号")
|
|
||||||
private String boxPalletNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("币制")
|
|
||||||
@Excel(name = "币制")
|
|
||||||
private String currency;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位")
|
|
||||||
@Excel(name = "单位")
|
|
||||||
private String unit;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报数量")
|
|
||||||
@Excel(name = "申报数量")
|
|
||||||
private BigDecimal declaredQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("箱数")
|
|
||||||
@Excel(name = "箱数")
|
|
||||||
private BigDecimal boxCount;
|
|
||||||
|
|
||||||
@ApiModelProperty("件数")
|
|
||||||
@Excel(name = "件数")
|
|
||||||
private BigDecimal pieceCount;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库数量（输入大于等于0的数字，可以为小数）")
|
|
||||||
@Excel(name = "入库数量")
|
|
||||||
private BigDecimal inboundQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("总净重(KG)")
|
|
||||||
@Excel(name = "总净重(KG)")
|
|
||||||
private BigDecimal totalNetWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("总毛重(KG)")
|
|
||||||
@Excel(name = "总毛重(KG)")
|
|
||||||
private BigDecimal totalGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("总体积(CBM)")
|
|
||||||
@Excel(name = "总体积(CBM)")
|
|
||||||
private BigDecimal totalVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("总面积(SQM)")
|
|
||||||
@Excel(name = "总面积(SQM)")
|
|
||||||
private BigDecimal totalArea;
|
|
||||||
|
|
||||||
@ApiModelProperty("总价")
|
|
||||||
@Excel(name = "总价")
|
|
||||||
private BigDecimal totalPrice;
|
|
||||||
|
|
||||||
@ApiModelProperty("合同收费")
|
|
||||||
@Excel(name = "合同收费")
|
|
||||||
private BigDecimal contractFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("每月仓租")
|
|
||||||
@Excel(name = "每月仓租")
|
|
||||||
private BigDecimal monthlyWarehouseFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("半月仓租")
|
|
||||||
@Excel(name = "半月仓租")
|
|
||||||
private BigDecimal halfMonthWhFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("折扣(%)")
|
|
||||||
@Excel(name = "折扣(%)")
|
|
||||||
private BigDecimal discountRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("单体积(CBM)")
|
|
||||||
@Excel(name = "单体积(CBM)")
|
|
||||||
private BigDecimal singleVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("单毛重(KG)")
|
|
||||||
@Excel(name = "单毛重(KG)")
|
|
||||||
private BigDecimal singleGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("lot编号")
|
|
||||||
@Excel(name = "lot编号")
|
|
||||||
private String lotNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("oms入库单详情id")
|
|
||||||
@Excel(name = "oms入库单详情id")
|
|
||||||
private String omsInMaterialDetail;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "饮用时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
|
||||||
private Date drinkDate;
|
|
||||||
}
|
|
||||||
-371
@@ -1,371 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
||||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料明细对象 material_detail
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-21
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class InMaterialDetailTZPD extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单物料明细id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long materialDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务唯一id")
|
|
||||||
@JsonSerialize(using = ToStringSerializer.class)
|
|
||||||
private Long uniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单号")
|
|
||||||
@Excel(name = "入库单号")
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料基础信息id")
|
|
||||||
@Excel(name = "物料基础信息id")
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料编码")
|
|
||||||
@Excel(name = "物料编码")
|
|
||||||
private String materialCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料名称")
|
|
||||||
@Excel(name = "物料名称")
|
|
||||||
private String materialName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料条形码")
|
|
||||||
@Excel(name = "物料条形码")
|
|
||||||
private String barCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("收货数量")
|
|
||||||
@Excel(name = "收货数量")
|
|
||||||
private BigDecimal receiptQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架数量")
|
|
||||||
@Excel(name = "上架数量")
|
|
||||||
private BigDecimal shelvesQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("作业数量（例如：收货数量 上架数量）")
|
|
||||||
@Excel(name = "作业数量（例如：收货数量 上架数量）")
|
|
||||||
private BigDecimal actualQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("收货状态: 1-待收货 2-收货中 3-已收货 4-已收货（少收） 5-已收货（超收）")
|
|
||||||
@Excel(name = "收货状态: 1-待收货 2-收货中 3-已收货 4-已收货（少收） 5-已收货（超收）")
|
|
||||||
private Integer receiptStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架状态: 1-待上架 2-上架中 3-已上架 4-已上架（少上） 5-已上架（超上）")
|
|
||||||
@Excel(name = "上架状态: 1-待上架 2-上架中 3-已上架 4-已上架（少上） 5-已上架（超上）")
|
|
||||||
private Integer shelvesStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格id")
|
|
||||||
@Excel(name = "包装规格id")
|
|
||||||
private Long packId;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格编码")
|
|
||||||
@Excel(name = "包装规格编码")
|
|
||||||
private String packCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格名称")
|
|
||||||
@Excel(name = "包装规格名称")
|
|
||||||
private String packName;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装详情id")
|
|
||||||
@Excel(name = "包装详情id")
|
|
||||||
private Long packDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位代码：EA IP CS PL OT")
|
|
||||||
@Excel(name = "单位代码：EA IP CS PL OT")
|
|
||||||
private String unitCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位名称")
|
|
||||||
@Excel(name = "单位名称")
|
|
||||||
private String unitName;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位数量")
|
|
||||||
@Excel(name = "单位数量")
|
|
||||||
private BigDecimal unitNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料仓库控制信息id")
|
|
||||||
@Excel(name = "物料仓库控制信息id")
|
|
||||||
private Long materialWarehouseControlId;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否序列号管理: 1-是 2-否")
|
|
||||||
@Excel(name = "是否序列号管理: 1-是 2-否")
|
|
||||||
private Integer serialNumberManage;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否质检管理: 1-是 2-否")
|
|
||||||
@Excel(name = "是否质检管理: 1-是 2-否")
|
|
||||||
private Integer qualityInspectionManage;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检阶段: 1-收货前 2-收货后上架前")
|
|
||||||
@Excel(name = "质检阶段: 1-收货前 2-收货后上架前")
|
|
||||||
private Integer qualityInspectionStage;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检规则: 1-全检 2-抽检 ")
|
|
||||||
@Excel(name = "质检规则: 1-全检 2-抽检 ")
|
|
||||||
private Integer qualityInspectionRule;
|
|
||||||
|
|
||||||
@ApiModelProperty("抽检比例")
|
|
||||||
@Excel(name = "抽检比例")
|
|
||||||
private BigDecimal qualityInspectionRatio;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检项: 1-包装 2-纯度")
|
|
||||||
@Excel(name = "质检项: 1-包装 2-纯度")
|
|
||||||
private Integer qualityInspectionTerm;
|
|
||||||
|
|
||||||
@ApiModelProperty("质检结果: 1-正常 2-异常")
|
|
||||||
@Excel(name = "质检结果: 1-正常 2-异常")
|
|
||||||
private Integer qualityInspectionResults;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否允许超收: 1-是 2-否")
|
|
||||||
@Excel(name = "是否允许超收: 1-是 2-否")
|
|
||||||
private Integer allowOvercharge;
|
|
||||||
|
|
||||||
@ApiModelProperty("超收比例")
|
|
||||||
@Excel(name = "超收比例")
|
|
||||||
private BigDecimal overchargeRatio;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次号")
|
|
||||||
@Excel(name = "批次号")
|
|
||||||
private String batchNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态编码")
|
|
||||||
@Excel(name = "物料状态编码")
|
|
||||||
private String materialStatusCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态名称")
|
|
||||||
@Excel(name = "物料状态名称")
|
|
||||||
private String materialStatusName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配规则id")
|
|
||||||
@Excel(name = "分配规则id")
|
|
||||||
private Long distributeRuleId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配规则编码")
|
|
||||||
@Excel(name = "分配规则编码")
|
|
||||||
private String distributeRuleCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配规则名称")
|
|
||||||
@Excel(name = "分配规则名称")
|
|
||||||
private String distributeRuleName;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器id")
|
|
||||||
@Excel(name = "容器id")
|
|
||||||
private Long containerId;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器编码")
|
|
||||||
@Excel(name = "容器编码")
|
|
||||||
private String containerCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型 数据字典")
|
|
||||||
@Excel(name = "容器类型 数据字典")
|
|
||||||
private String containerType;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型名称 数据字典")
|
|
||||||
@Excel(name = "容器类型名称 数据字典")
|
|
||||||
private String containerTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架仓库编码")
|
|
||||||
@Excel(name = "上架仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库区id")
|
|
||||||
@Excel(name = "上架库区id")
|
|
||||||
private Long storageSectionId;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库区编码")
|
|
||||||
@Excel(name = "上架库区编码")
|
|
||||||
private String storageCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库区名称")
|
|
||||||
@Excel(name = "上架库区名称")
|
|
||||||
private String storageName;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库位id")
|
|
||||||
@Excel(name = "上架库位id")
|
|
||||||
private Long storageLocationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库位编码")
|
|
||||||
@Excel(name = "上架库位编码")
|
|
||||||
private String storageLocationCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架库位名称")
|
|
||||||
@Excel(name = "上架库位名称")
|
|
||||||
private String storageLocationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("层级深度，从一级开始递增")
|
|
||||||
private Integer level;
|
|
||||||
|
|
||||||
@ApiModelProperty("父级唯一Id")
|
|
||||||
private Long parentUniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
// ========== 报关相关明细字段 ==========
|
|
||||||
@ApiModelProperty("规格型号")
|
|
||||||
@Excel(name = "规格型号/ITEM")
|
|
||||||
private String specificationModel;
|
|
||||||
|
|
||||||
@ApiModelProperty("SKU码")
|
|
||||||
@Excel(name = "SKU码")
|
|
||||||
private String skuCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("Invoice No.")
|
|
||||||
@Excel(name = "Invoice No.")
|
|
||||||
private String invoiceNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("升")
|
|
||||||
@Excel(name = "升")
|
|
||||||
private BigDecimal liter;
|
|
||||||
|
|
||||||
@ApiModelProperty("尺寸")
|
|
||||||
@Excel(name = "尺寸")
|
|
||||||
private String dimensions;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报单位")
|
|
||||||
@Excel(name = "申报单位")
|
|
||||||
private String declarationUnit;
|
|
||||||
|
|
||||||
@ApiModelProperty("Batch Ref NO's")
|
|
||||||
@Excel(name = "Batch Ref NO's")
|
|
||||||
private String batchRefNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("Sheet Ref NO's")
|
|
||||||
@Excel(name = "Sheet Ref NO's")
|
|
||||||
private String sheetRefNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("原产国")
|
|
||||||
@Excel(name = "原产国")
|
|
||||||
private String originCountry;
|
|
||||||
|
|
||||||
@ApiModelProperty("箱号/卡板号")
|
|
||||||
@Excel(name = "箱号/卡板号")
|
|
||||||
private String boxPalletNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("币制")
|
|
||||||
@Excel(name = "币制")
|
|
||||||
private String currency;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位")
|
|
||||||
@Excel(name = "单位")
|
|
||||||
private String unit;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报数量")
|
|
||||||
@Excel(name = "申报数量")
|
|
||||||
private BigDecimal declaredQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("箱数")
|
|
||||||
@Excel(name = "箱数")
|
|
||||||
private BigDecimal boxCount;
|
|
||||||
|
|
||||||
@ApiModelProperty("件数")
|
|
||||||
@Excel(name = "件数")
|
|
||||||
private BigDecimal pieceCount;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库数量（输入大于等于0的数字，可以为小数）")
|
|
||||||
@Excel(name = "入库数量")
|
|
||||||
private BigDecimal inboundQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("总净重(KG)")
|
|
||||||
@Excel(name = "总净重(KG)")
|
|
||||||
private BigDecimal totalNetWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("总毛重(KG)")
|
|
||||||
@Excel(name = "总毛重(KG)")
|
|
||||||
private BigDecimal totalGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("总体积(CBM)")
|
|
||||||
@Excel(name = "总体积(CBM)")
|
|
||||||
private BigDecimal totalVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("总面积(SQM)")
|
|
||||||
@Excel(name = "总面积(SQM)")
|
|
||||||
private BigDecimal totalArea;
|
|
||||||
|
|
||||||
@ApiModelProperty("总价")
|
|
||||||
@Excel(name = "总价")
|
|
||||||
private BigDecimal totalPrice;
|
|
||||||
|
|
||||||
@ApiModelProperty("合同收费")
|
|
||||||
@Excel(name = "合同收费")
|
|
||||||
private BigDecimal contractFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("每月仓租")
|
|
||||||
@Excel(name = "每月仓租")
|
|
||||||
private BigDecimal monthlyWarehouseFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("半月仓租")
|
|
||||||
@Excel(name = "半月仓租")
|
|
||||||
private BigDecimal halfMonthWhFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("折扣(%)")
|
|
||||||
@Excel(name = "折扣(%)")
|
|
||||||
private BigDecimal discountRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("单体积(CBM)")
|
|
||||||
@Excel(name = "单体积(CBM)")
|
|
||||||
private BigDecimal singleVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("单毛重(KG)")
|
|
||||||
@Excel(name = "单毛重(KG)")
|
|
||||||
private BigDecimal singleGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("lot编号")
|
|
||||||
@Excel(name = "lot编号")
|
|
||||||
private String lotNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("oms入库单详情id")
|
|
||||||
@Excel(name = "oms入库单详情id")
|
|
||||||
private String omsInMaterialDetail;
|
|
||||||
}
|
|
||||||
-202
@@ -1,202 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 库存调整记录对象 inventory_adjustment_record
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-07-17
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class InventoryAdjustmentRecord extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存调整记录id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long inventoryAdjustmentId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料库存id")
|
|
||||||
private Long materialInventoryId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料基础信息id")
|
|
||||||
@Excel(name = "物料基础信息id")
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料编码")
|
|
||||||
@Excel(name = "物料编码")
|
|
||||||
private String materialCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料名称")
|
|
||||||
@Excel(name = "物料名称")
|
|
||||||
private String materialName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料条形码")
|
|
||||||
@Excel(name = "物料条形码")
|
|
||||||
private String barCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主id")
|
|
||||||
@Excel(name = "货主id")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主名称")
|
|
||||||
@Excel(name = "货主名称")
|
|
||||||
private String shipperName;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库id")
|
|
||||||
@Excel(name = "仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库编码")
|
|
||||||
@Excel(name = "仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("库区id")
|
|
||||||
@Excel(name = "库区id")
|
|
||||||
private Long storageSectionId;
|
|
||||||
|
|
||||||
@ApiModelProperty("库区编码")
|
|
||||||
@Excel(name = "库区编码")
|
|
||||||
private String storageCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("库区名称")
|
|
||||||
@Excel(name = "库区名称")
|
|
||||||
private String storageName;
|
|
||||||
|
|
||||||
@ApiModelProperty("库位id")
|
|
||||||
@Excel(name = "库位id")
|
|
||||||
private Long storageLocationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("库位编码")
|
|
||||||
@Excel(name = "库位编码")
|
|
||||||
private String storageLocationCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("库位名称")
|
|
||||||
@Excel(name = "库位名称")
|
|
||||||
private String storageLocationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整类型：0：无状态 1：数量调整 :2：状态调整 3:库存冻结")
|
|
||||||
@Excel(name = "调整类型：0：无状态 1：数量调整 :2：状态调整 3:库存冻结")
|
|
||||||
private Long adjustType;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整方向：0：无状态 1：增库存 2：减库存")
|
|
||||||
@Excel(name = "调整方向：0：无状态 1：增库存 2：减库存")
|
|
||||||
private Long adjustDirection;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前状态编码")
|
|
||||||
@Excel(name = "调整前状态编码")
|
|
||||||
private String adjustBeforeStatusCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前状态名称")
|
|
||||||
@Excel(name = "调整前状态名称")
|
|
||||||
private String adjustBeforeStatusName;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后状态编码")
|
|
||||||
@Excel(name = "调整后状态编码")
|
|
||||||
private String adjustAfterStatusCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后状态名称")
|
|
||||||
@Excel(name = "调整后状态名称")
|
|
||||||
private String adjustAfterStatusName;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前库存数量")
|
|
||||||
@Excel(name = "调整前库存数量")
|
|
||||||
private BigDecimal inventoryBeforeQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前可用数量")
|
|
||||||
@Excel(name = "调整前可用数量")
|
|
||||||
private BigDecimal allocationBeforeQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前冻结数量")
|
|
||||||
@Excel(name = "调整前冻结数量")
|
|
||||||
private BigDecimal freezeBeforeQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后库存数量")
|
|
||||||
@Excel(name = "调整后库存数量")
|
|
||||||
private BigDecimal inventoryAfterQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后可用数量")
|
|
||||||
@Excel(name = "调整后可用数量")
|
|
||||||
private BigDecimal allocationAfterQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后冻结数量")
|
|
||||||
@Excel(name = "调整后冻结数量")
|
|
||||||
private BigDecimal freezeAfterQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整动作")
|
|
||||||
@Excel(name = "调整动作")
|
|
||||||
private String adjustAction;
|
|
||||||
|
|
||||||
@ApiModelProperty("关联单号")
|
|
||||||
@Excel(name = "关联单号")
|
|
||||||
private String relateNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前净重(KG)")
|
|
||||||
@Excel(name = "调整前净重(KG)")
|
|
||||||
private BigDecimal netWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前毛重(KG)")
|
|
||||||
@Excel(name = "调整前毛重(KG)")
|
|
||||||
private BigDecimal grossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前体积")
|
|
||||||
@Excel(name = "调整前体积")
|
|
||||||
private BigDecimal volume;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整前面积")
|
|
||||||
@Excel(name = "调整前面积")
|
|
||||||
private BigDecimal area;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后净重(KG)")
|
|
||||||
@Excel(name = "调整后净重(KG)")
|
|
||||||
private BigDecimal adjustedNetWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后毛重(KG)")
|
|
||||||
@Excel(name = "调整后毛重(KG)")
|
|
||||||
private BigDecimal adjustedGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后体积")
|
|
||||||
@Excel(name = "调整后体积")
|
|
||||||
private BigDecimal adjustedVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("调整后面积")
|
|
||||||
@Excel(name = "调整后面积")
|
|
||||||
private BigDecimal adjustedArea;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单号")
|
|
||||||
@Excel(name = "入库单号")
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("LOT编号")
|
|
||||||
@Excel(name = "LOT编号")
|
|
||||||
private String lotNumber;
|
|
||||||
@ApiModelProperty("批次号")
|
|
||||||
@Excel(name = "批次号")
|
|
||||||
private String batchNumber;
|
|
||||||
|
|
||||||
}
|
|
||||||
-5
@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -67,10 +66,6 @@ public class MaterialBarCodeFeign extends BaseVOEntity{
|
|||||||
@Excel(name = "名称")
|
@Excel(name = "名称")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@ApiModelProperty("数量")
|
|
||||||
@Excel(name = "数量")
|
|
||||||
private BigDecimal number;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
@ApiModelProperty("备注")
|
||||||
@Excel(name = "备注")
|
@Excel(name = "备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|||||||
+1
-33
@@ -202,19 +202,6 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
|
|||||||
|
|
||||||
@ApiModelProperty("法定第二单位")
|
@ApiModelProperty("法定第二单位")
|
||||||
private String statutorySecondUnit;
|
private String statutorySecondUnit;
|
||||||
|
|
||||||
@ApiModelProperty("是否抄码: 1-是 2-否")
|
|
||||||
@Excel(name = "是否抄码: 1-是 2-否")
|
|
||||||
private Integer copyCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
|
|
||||||
@Excel(name = "货物类型:0-物料 1-半成品 2-成品")
|
|
||||||
private Integer goodsType;
|
|
||||||
|
|
||||||
@ApiModelProperty("毛重（kg）")
|
|
||||||
@Excel(name = "毛重（kg）")
|
|
||||||
private BigDecimal grossWeight;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 规格型号
|
* 规格型号
|
||||||
*/
|
*/
|
||||||
@@ -224,24 +211,5 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
|
|||||||
|
|
||||||
@ApiModelProperty("币制")
|
@ApiModelProperty("币制")
|
||||||
private String currency;
|
private String currency;
|
||||||
|
}
|
||||||
|
|
||||||
@ApiModelProperty("货主编码")
|
|
||||||
@Excel(name = "货主编码")
|
|
||||||
private String shipperCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("复合条件查询 物料名称 物料编码 物料条码")
|
|
||||||
private String compoundOrQuery;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次ID")
|
|
||||||
private Long batchId;
|
|
||||||
|
|
||||||
@ApiModelProperty("保额")
|
|
||||||
@Excel(name = "保额")
|
|
||||||
private BigDecimal insureAmount;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "收费标准")
|
|
||||||
private BigDecimal chargeStandard;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "单位")
|
|
||||||
private String unit;
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.handler.ListTypeHandler;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author ZhouGY
|
|
||||||
* @title MaterialBaseDO
|
|
||||||
* @description: TODO
|
|
||||||
* @date 2024/7/5 10:59
|
|
||||||
**/
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
|
||||||
@Data
|
|
||||||
public class MaterialBasePO extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主id")
|
|
||||||
@Excel(name = "货主id")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主编码")
|
|
||||||
@Excel(name = "货主编码")
|
|
||||||
private String shipperCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主名称")
|
|
||||||
@Excel(name = "货主名称")
|
|
||||||
private String shipperName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料编码")
|
|
||||||
@Excel(name = "物料编码")
|
|
||||||
private String materialCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料名称")
|
|
||||||
@Excel(name = "物料名称")
|
|
||||||
private String materialName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料条形码")
|
|
||||||
@Excel(name = "物料条形码")
|
|
||||||
private String barCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料分类编码")
|
|
||||||
@Excel(name = "物料分类编码")
|
|
||||||
@TableField(typeHandler = ListTypeHandler.class)
|
|
||||||
private List<String> materialClassifyCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料分类名称")
|
|
||||||
@Excel(name = "物料分类名称")
|
|
||||||
@TableField(typeHandler = ListTypeHandler.class)
|
|
||||||
private List<String> materialClassifyName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料种类编码 数据字典")
|
|
||||||
@Excel(name = "物料种类编码 数据字典")
|
|
||||||
private String materialType;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料种类名称 数据字典")
|
|
||||||
@Excel(name = "物料种类名称 数据字典")
|
|
||||||
private String materialTypeName;
|
|
||||||
}
|
|
||||||
+3
-3
@@ -82,12 +82,12 @@ public class MaterialCommonFeign extends BaseVOEntity{
|
|||||||
private String dangerLevelName;
|
private String dangerLevelName;
|
||||||
|
|
||||||
@ApiModelProperty("生产日期")
|
@ApiModelProperty("生产日期")
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
private Date productionTime;
|
private Date productionTime;
|
||||||
|
|
||||||
@ApiModelProperty("失效日期")
|
@ApiModelProperty("失效日期")
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
private Date expirationTime;
|
private Date expirationTime;
|
||||||
|
|
||||||
@@ -101,4 +101,4 @@ public class MaterialCommonFeign extends BaseVOEntity{
|
|||||||
|
|
||||||
@ApiModelProperty(name = "权限菜单ID")
|
@ApiModelProperty(name = "权限菜单ID")
|
||||||
private Long permissionMenuId;
|
private Long permissionMenuId;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,57 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@ApiModel(description = "物料信息查询DTO")
|
|
||||||
public class MaterialInfoDTO {
|
|
||||||
|
|
||||||
@ApiModelProperty("物料id")
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料id")
|
|
||||||
private String materialCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料名称")
|
|
||||||
private String materialName;
|
|
||||||
|
|
||||||
@ApiModelProperty("货物类型 0-料件 1-半成品 2-成品")
|
|
||||||
private Integer goodsType;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("创建时间起")
|
|
||||||
private String createTimeStart;
|
|
||||||
|
|
||||||
@ApiModelProperty("创建时间止")
|
|
||||||
private String createTimeEnd;
|
|
||||||
|
|
||||||
@ApiModelProperty("更新时间起")
|
|
||||||
private String updateTimeStart;
|
|
||||||
|
|
||||||
@ApiModelProperty("更新时间止")
|
|
||||||
private String updateTimeEnd;
|
|
||||||
|
|
||||||
@ApiModelProperty("推送状态")
|
|
||||||
private Integer pushStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("推送时间起")
|
|
||||||
private String pushTimeStart;
|
|
||||||
|
|
||||||
@ApiModelProperty("推送时间止")
|
|
||||||
private String pushTimeEnd;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码")
|
|
||||||
private Integer pageNum = 1;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "每页数量")
|
|
||||||
private Integer pageSize = 10;
|
|
||||||
|
|
||||||
}
|
|
||||||
-87
@@ -1,87 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import com.mhd.system.api.model.LoginUser;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料库存对象 material_inventory
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-29
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class MaterialInventoryOmsParamDO extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
//库存id
|
|
||||||
private Long materialInventoryId;
|
|
||||||
//物料基础信息id
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
//物料明细ID
|
|
||||||
private Long materialDetailId;
|
|
||||||
//仓库信息参数
|
|
||||||
private Long organizationId;
|
|
||||||
private String organizationName;
|
|
||||||
private Long topOrganizationId;
|
|
||||||
//仓库ID
|
|
||||||
private Long warehouseId;
|
|
||||||
//仓库编码
|
|
||||||
private String warehouseCode;
|
|
||||||
//仓库名称
|
|
||||||
private String warehouseName;
|
|
||||||
//存储区ID
|
|
||||||
private Long storageSectionId;
|
|
||||||
//存储区编码
|
|
||||||
private String storageCode;
|
|
||||||
//存储区名称
|
|
||||||
private String storageName;
|
|
||||||
//存储位置ID
|
|
||||||
private Long storageLocationId;
|
|
||||||
//存储位置编码
|
|
||||||
private String storageLocationCode;
|
|
||||||
//存储位置名称
|
|
||||||
private String storageLocationName;
|
|
||||||
//调整数量
|
|
||||||
private BigDecimal quantity;
|
|
||||||
//净重
|
|
||||||
private BigDecimal netWeight;
|
|
||||||
//毛重
|
|
||||||
private BigDecimal grossWeight;
|
|
||||||
//体积
|
|
||||||
private BigDecimal volume;
|
|
||||||
//面积
|
|
||||||
private BigDecimal area;
|
|
||||||
//类型(1:上架2:分配3:取消分配4:出库交接5:移位6:库存调整7:库存冻结)
|
|
||||||
private String type;
|
|
||||||
|
|
||||||
private String barCode;
|
|
||||||
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
private String lotNumber;
|
|
||||||
|
|
||||||
private String batchNumber;
|
|
||||||
|
|
||||||
private String isNew;
|
|
||||||
|
|
||||||
/** 业务关联单号（出库单号、交接单对应单号等），用于库存调整记录 relate_no；可与入库单号区分 */
|
|
||||||
private String relateNo;
|
|
||||||
|
|
||||||
private String kctzType;
|
|
||||||
|
|
||||||
private LoginUser loginUser;
|
|
||||||
|
|
||||||
|
|
||||||
private String batchNo;
|
|
||||||
|
|
||||||
//生产日期
|
|
||||||
private Date productionDate;
|
|
||||||
//过期日期
|
|
||||||
private Date expiryDate;
|
|
||||||
|
|
||||||
}
|
|
||||||
-217
@@ -1,217 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料库存对象 material_inventory
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-29
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@ApiModel(value = "物料库存对象", description = "物料库存响应对象")
|
|
||||||
public class MaterialInventoryPO extends MaterialBasePO {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料库存id")
|
|
||||||
private Long materialInventoryId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料基础信息id")
|
|
||||||
@Excel(name = "物料基础信息id")
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
|
|
||||||
@ApiModelProperty("上架单物料明细id")
|
|
||||||
@Excel(name = "上架单物料明细id")
|
|
||||||
private Long materialDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库id")
|
|
||||||
@Excel(name = "仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库编码")
|
|
||||||
@Excel(name = "仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("库区id")
|
|
||||||
@Excel(name = "库区id")
|
|
||||||
private Long storageSectionId;
|
|
||||||
|
|
||||||
@ApiModelProperty("库区编码")
|
|
||||||
@Excel(name = "库区编码")
|
|
||||||
private String storageCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("库区名称")
|
|
||||||
@Excel(name = "库区名称")
|
|
||||||
private String storageName;
|
|
||||||
|
|
||||||
@ApiModelProperty("库位id")
|
|
||||||
@Excel(name = "库位id")
|
|
||||||
private Long storageLocationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("库位编码")
|
|
||||||
@Excel(name = "库位编码")
|
|
||||||
private String storageLocationCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("库位名称")
|
|
||||||
@Excel(name = "库位名称")
|
|
||||||
private String storageLocationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次号")
|
|
||||||
@Excel(name = "批次号")
|
|
||||||
private String batchNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态编码")
|
|
||||||
@Excel(name = "物料状态编码")
|
|
||||||
private String materialStatusCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态名称")
|
|
||||||
@Excel(name = "物料状态名称")
|
|
||||||
private String materialStatusName;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器id")
|
|
||||||
@Excel(name = "容器id")
|
|
||||||
private Long containerId;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器编码")
|
|
||||||
@Excel(name = "容器编码")
|
|
||||||
private String containerCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型 数据字典")
|
|
||||||
@Excel(name = "容器类型 数据字典")
|
|
||||||
private String containerType;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型名称 数据字典")
|
|
||||||
@Excel(name = "容器类型名称 数据字典")
|
|
||||||
private String containerTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存数量")
|
|
||||||
@Excel(name = "库存数量")
|
|
||||||
private BigDecimal inventoryQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("可用数量")
|
|
||||||
@Excel(name = "可用数量")
|
|
||||||
private BigDecimal allocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("冻结数量")
|
|
||||||
@Excel(name = "冻结数量")
|
|
||||||
private BigDecimal freezeQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("盘点是否可用：0-禁用 1-可用")
|
|
||||||
@Excel(name = "盘点是否可用：0-禁用 1-可用")
|
|
||||||
private Integer isAble;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("单位")
|
|
||||||
@Excel(name = "单位")
|
|
||||||
private String unit;
|
|
||||||
|
|
||||||
@ApiModelProperty("净重(KG)")
|
|
||||||
@Excel(name = "净重(KG)")
|
|
||||||
private BigDecimal netWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("毛重(KG)")
|
|
||||||
@Excel(name = "毛重(KG)")
|
|
||||||
private BigDecimal grossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积")
|
|
||||||
@Excel(name = "体积")
|
|
||||||
private BigDecimal volume;
|
|
||||||
|
|
||||||
@ApiModelProperty("面积")
|
|
||||||
@Excel(name = "面积")
|
|
||||||
private BigDecimal area;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("Batch Ref NO's")
|
|
||||||
@Excel(name = "Batch Ref NO's")
|
|
||||||
private String batchRefNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("Sheet Ref NO's")
|
|
||||||
@Excel(name = "Sheet Ref NO's")
|
|
||||||
private String sheetRefNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("箱号/卡板号")
|
|
||||||
@Excel(name = "箱号/卡板号")
|
|
||||||
private String boxPalletNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展字段1")
|
|
||||||
@Excel(name = "扩展字段1")
|
|
||||||
private String extAttr1;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展字段2")
|
|
||||||
@Excel(name = "扩展字段2")
|
|
||||||
private String extAttr2;
|
|
||||||
|
|
||||||
@ApiModelProperty("生产日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date productionDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("过期日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date expiryDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("存货日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date inventoryDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("ExtAttr3")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date extAttr3;
|
|
||||||
|
|
||||||
@ApiModelProperty("ExtAttr4")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date extAttr4;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料更多属性列表（批次属性）")
|
|
||||||
private List<MaterialMoreDetailPO> materialMoreDetailList;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装名")
|
|
||||||
@Excel(name = "包装名")
|
|
||||||
private String packName;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("单位名")
|
|
||||||
@Excel(name = "单位名")
|
|
||||||
private String unitName;
|
|
||||||
}
|
|
||||||
-79
@@ -1,79 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料更多属性明细对象 material_more_detail
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-21
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@ApiModel(value = "物料更多属性明细对象", description = "物料更多属性明细响应对象")
|
|
||||||
public class MaterialMoreDetailPO extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料更多属性明细id")
|
|
||||||
private Long materialMoreDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("来源单号")
|
|
||||||
@Excel(name = "来源单号")
|
|
||||||
private String orderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单物料明细业务唯一id")
|
|
||||||
@Excel(name = "订单物料明细业务唯一id")
|
|
||||||
private Long materialDetailUniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次id")
|
|
||||||
@Excel(name = "批次id")
|
|
||||||
private Long batchId;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次详情id")
|
|
||||||
@Excel(name = "批次详情id")
|
|
||||||
private Long batchDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次标签")
|
|
||||||
@Excel(name = "批次标签")
|
|
||||||
private String batchLabels;
|
|
||||||
|
|
||||||
@ApiModelProperty("输入控制: 1-必填 2-可选")
|
|
||||||
@Excel(name = "输入控制: 1-必填 2-可选")
|
|
||||||
private String inputControl;
|
|
||||||
|
|
||||||
@ApiModelProperty("属性格式：1-下拉框 2-日期 3-日期时间 4-数字 5-文本")
|
|
||||||
@Excel(name = "属性格式：1-下拉框 2-日期 3-日期时间 4-数字 5-文本")
|
|
||||||
private String attributeFormat;
|
|
||||||
|
|
||||||
@ApiModelProperty("属性选项")
|
|
||||||
@Excel(name = "属性选项")
|
|
||||||
private String attributeOption;
|
|
||||||
|
|
||||||
@ApiModelProperty("属性值")
|
|
||||||
@Excel(name = "属性值")
|
|
||||||
private String attributeValue;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
-496
@@ -1,496 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
||||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料明细对象 material_detail
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-21
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class OutMaterialDetail extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单物料明细id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long materialDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务唯一id")
|
|
||||||
@JsonSerialize(using = ToStringSerializer.class)
|
|
||||||
private Long uniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单号")
|
|
||||||
@Excel(name = "出库单号")
|
|
||||||
private String outOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料基础信息id")
|
|
||||||
@Excel(name = "物料基础信息id")
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料编码")
|
|
||||||
@Excel(name = "物料编码")
|
|
||||||
private String materialCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料名称")
|
|
||||||
@Excel(name = "物料名称")
|
|
||||||
private String materialName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料条形码")
|
|
||||||
@Excel(name = "物料条形码")
|
|
||||||
private String barCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("已分配数量")
|
|
||||||
@Excel(name = "已分配数量")
|
|
||||||
private BigDecimal alreadyAllocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("本次分配数量")
|
|
||||||
@Excel(name = "本次分配数量")
|
|
||||||
@TableField(exist = false)
|
|
||||||
private BigDecimal nowAllocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配数量")
|
|
||||||
@Excel(name = "分配数量")
|
|
||||||
private BigDecimal allocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("拣货数量")
|
|
||||||
@Excel(name = "拣货数量")
|
|
||||||
private BigDecimal pickingQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核数量")
|
|
||||||
@Excel(name = "复核数量")
|
|
||||||
private BigDecimal checkQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("净重 单位：千克")
|
|
||||||
@Excel(name = "净重 单位：千克")
|
|
||||||
private BigDecimal weightLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积 单位：立方米")
|
|
||||||
@Excel(name = "体积 单位：立方米")
|
|
||||||
private BigDecimal volumeLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格id")
|
|
||||||
@Excel(name = "包装规格id")
|
|
||||||
private Long packId;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格编码")
|
|
||||||
@Excel(name = "包装规格编码")
|
|
||||||
private String packCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格名称")
|
|
||||||
@Excel(name = "包装规格名称")
|
|
||||||
private String packName;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装详情id")
|
|
||||||
@Excel(name = "包装详情id")
|
|
||||||
private Long packDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位代码：EA IP CS PL OT")
|
|
||||||
@Excel(name = "单位代码：EA IP CS PL OT")
|
|
||||||
private String unitCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位名称")
|
|
||||||
@Excel(name = "单位名称")
|
|
||||||
private String unitName;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位数量")
|
|
||||||
@Excel(name = "单位数量")
|
|
||||||
private BigDecimal unitNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料仓库控制信息id")
|
|
||||||
@Excel(name = "物料仓库控制信息id")
|
|
||||||
private Long materialWarehouseControlId;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否序列号管理: 1-是 2-否")
|
|
||||||
@Excel(name = "是否序列号管理: 1-是 2-否")
|
|
||||||
private Integer serialNumberManage;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料库存id")
|
|
||||||
@Excel(name = "物料库存id")
|
|
||||||
private Long materialInventoryId;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次号")
|
|
||||||
@Excel(name = "批次号")
|
|
||||||
private String batchNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态编码")
|
|
||||||
@Excel(name = "物料状态编码")
|
|
||||||
private String materialStatusCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态名称")
|
|
||||||
@Excel(name = "物料状态名称")
|
|
||||||
private String materialStatusName;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器id")
|
|
||||||
@Excel(name = "容器id")
|
|
||||||
private Long containerId;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器编码")
|
|
||||||
@Excel(name = "容器编码")
|
|
||||||
private String containerCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型 数据字典")
|
|
||||||
@Excel(name = "容器类型 数据字典")
|
|
||||||
private String containerType;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型名称 数据字典")
|
|
||||||
@Excel(name = "容器类型名称 数据字典")
|
|
||||||
private String containerTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配仓库编码")
|
|
||||||
@Excel(name = "分配仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库区id")
|
|
||||||
@Excel(name = "分配库区id")
|
|
||||||
private Long storageSectionId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库区编码")
|
|
||||||
@Excel(name = "分配库区编码")
|
|
||||||
private String storageCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库区名称")
|
|
||||||
@Excel(name = "分配库区名称")
|
|
||||||
private String storageName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库位id")
|
|
||||||
@Excel(name = "分配库位id")
|
|
||||||
private Long storageLocationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库位编码")
|
|
||||||
@Excel(name = "分配库位编码")
|
|
||||||
private String storageLocationCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库位名称")
|
|
||||||
@Excel(name = "分配库位名称")
|
|
||||||
private String storageLocationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("层级深度，从一级开始递增")
|
|
||||||
private Integer level;
|
|
||||||
|
|
||||||
@ApiModelProperty("父级唯一Id")
|
|
||||||
private Long parentUniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否允许修改: 1-是 2-否 分配后 不再支持修改")
|
|
||||||
@Excel(name = "是否允许修改: 1-是 2-否")
|
|
||||||
private Integer allowModify;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否生成拣货单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否生成拣货单: 1-是 2-否")
|
|
||||||
private Integer genPickingOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品名称
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("商品名称")
|
|
||||||
@Excel(name = "商品名称")
|
|
||||||
private String commodityName;
|
|
||||||
/**
|
|
||||||
* 商品编码
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("商品编码")
|
|
||||||
@Excel(name = "商品编码")
|
|
||||||
private String commodityNo;
|
|
||||||
/**
|
|
||||||
* 料号
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("料号")
|
|
||||||
@Excel(name = "料号")
|
|
||||||
private String materialNo;
|
|
||||||
/**
|
|
||||||
* 规格型号
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("规格型号")
|
|
||||||
@Excel(name = "规格型号")
|
|
||||||
private String specificationModel;
|
|
||||||
/**
|
|
||||||
* 商品SKU码
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("商品SKU码")
|
|
||||||
@Excel(name = "商品SKU码")
|
|
||||||
private String skucode;
|
|
||||||
/**
|
|
||||||
* Invoice No
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("Invoice No")
|
|
||||||
@Excel(name = "Invoice No")
|
|
||||||
private String invoiceNo;
|
|
||||||
/**
|
|
||||||
* 升
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("升")
|
|
||||||
@Excel(name = "升")
|
|
||||||
private String liter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 尺寸
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("尺寸")
|
|
||||||
@Excel(name = "尺寸")
|
|
||||||
private String size;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 申报单位
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("申报单位")
|
|
||||||
@Excel(name = "申报单位")
|
|
||||||
private String declareUnit;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Batch Ref NO’s
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("Batch Ref NO’s")
|
|
||||||
@Excel(name = "Batch Ref NO’s")
|
|
||||||
private String batchRefNo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sheet Ref NO’s
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("Sheet Ref NO’s")
|
|
||||||
@Excel(name = "Sheet Ref NO’s")
|
|
||||||
private String sheetRefNo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 原产国
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("原产国")
|
|
||||||
@Excel(name = "原产国")
|
|
||||||
private String countryOfOrigin;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 箱号/卡板号
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("箱号/卡板号")
|
|
||||||
@Excel(name = "箱号/卡板号")
|
|
||||||
private String boxPalletNo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 币制
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("币制")
|
|
||||||
@Excel(name = "币制")
|
|
||||||
private String currency;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 申报数量
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("申报数量")
|
|
||||||
@Excel(name = "申报数量")
|
|
||||||
private BigDecimal declareQuantity;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 箱数
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("箱数")
|
|
||||||
@Excel(name = "箱数")
|
|
||||||
private BigDecimal caseCount;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 件数
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("件数")
|
|
||||||
@Excel(name = "件数")
|
|
||||||
private BigDecimal pieceCount;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 出库数量
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("出库数量")
|
|
||||||
@Excel(name = "出库数量")
|
|
||||||
private BigDecimal outboundQuantity;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总净重(KG)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总净重(KG)")
|
|
||||||
@Excel(name = "总净重(KG)")
|
|
||||||
private BigDecimal totalNetWeight;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总毛重(KG)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总毛重(KG)")
|
|
||||||
@Excel(name = "总毛重(KG)")
|
|
||||||
private BigDecimal totalGrossWeight;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总体积(CBM)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总体积(CBM)")
|
|
||||||
@Excel(name = "总体积(CBM)")
|
|
||||||
private BigDecimal totalVolume;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总面积(SQM)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总面积(SQM)")
|
|
||||||
@Excel(name = "总面积(SQM)")
|
|
||||||
private BigDecimal totalArea;
|
|
||||||
/**
|
|
||||||
* 总价
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总价")
|
|
||||||
@Excel(name = "总价")
|
|
||||||
private BigDecimal totalAmount;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 单位
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("单位")
|
|
||||||
@Excel(name = "单位")
|
|
||||||
private String unit;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性1")
|
|
||||||
@Excel(name = "扩展属性1")
|
|
||||||
@TableField("ext_attr_1")
|
|
||||||
private String extAttr1;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性2")
|
|
||||||
@Excel(name = "扩展属性2")
|
|
||||||
@TableField("ext_attr_2")
|
|
||||||
private String extAttr2;
|
|
||||||
|
|
||||||
@ApiModelProperty("生产日期")
|
|
||||||
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date productionDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("过期日期")
|
|
||||||
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date expiryDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("存货日期")
|
|
||||||
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date inventoryDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性3")
|
|
||||||
@Excel(name = "扩展属性3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@TableField("ext_attr_3")
|
|
||||||
private Date extAttr3;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性4")
|
|
||||||
@Excel(name = "扩展属性4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@TableField("ext_attr_4")
|
|
||||||
private Date extAttr4;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 库存数量（仅用于前端展示，从material_inventory表中带出）
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("分配时库存数量")
|
|
||||||
private BigDecimal inventoryQuantity;
|
|
||||||
|
|
||||||
@TableField(exist = false)
|
|
||||||
private BigDecimal actualQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总净重(KG)")
|
|
||||||
@Excel(name = "复核总净重(KG)")
|
|
||||||
private BigDecimal checkNetWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总毛重(KG)")
|
|
||||||
@Excel(name = "复核总毛重(KG)")
|
|
||||||
private BigDecimal checkGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总体积(CBM)")
|
|
||||||
@Excel(name = "复核总体积(CBM)")
|
|
||||||
private BigDecimal checkVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总面积(SQM)")
|
|
||||||
@Excel(name = "复核总面积(SQM)")
|
|
||||||
private BigDecimal checkArea;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否已分配")
|
|
||||||
@Excel(name = "是否已分配")
|
|
||||||
private String isAllocated;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("合同收费")
|
|
||||||
@Excel(name = "合同收费")
|
|
||||||
private BigDecimal contractFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("每月仓租")
|
|
||||||
@Excel(name = "每月仓租")
|
|
||||||
private BigDecimal monthlyWarehouseFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("半月仓租")
|
|
||||||
@Excel(name = "半月仓租")
|
|
||||||
private BigDecimal halfMonthWhFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("折扣(%)")
|
|
||||||
@Excel(name = "折扣(%)")
|
|
||||||
private BigDecimal discountRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("单体积(CBM)")
|
|
||||||
@Excel(name = "单体积(CBM)")
|
|
||||||
private BigDecimal singleVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("单毛重(KG)")
|
|
||||||
@Excel(name = "单毛重(KG)")
|
|
||||||
private BigDecimal singleGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("lot编号")
|
|
||||||
@Excel(name = "lot编号")
|
|
||||||
private String lotNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单号")
|
|
||||||
@Excel(name = "入库单号")
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存单位")
|
|
||||||
@Excel(name = "库存单位")
|
|
||||||
private String stockUnit;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存数量")
|
|
||||||
@Excel(name = "库存数量")
|
|
||||||
private BigDecimal stockQuantity;
|
|
||||||
}
|
|
||||||
-496
@@ -1,496 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
||||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 物料明细对象 material_detail
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-21
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class OutMaterialDetailTZPD extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单物料明细id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long materialDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务唯一id")
|
|
||||||
@JsonSerialize(using = ToStringSerializer.class)
|
|
||||||
private Long uniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单号")
|
|
||||||
@Excel(name = "出库单号")
|
|
||||||
private String outOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料基础信息id")
|
|
||||||
@Excel(name = "物料基础信息id")
|
|
||||||
private Long materialBaseInfoId;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料编码")
|
|
||||||
@Excel(name = "物料编码")
|
|
||||||
private String materialCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料名称")
|
|
||||||
@Excel(name = "物料名称")
|
|
||||||
private String materialName;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料条形码")
|
|
||||||
@Excel(name = "物料条形码")
|
|
||||||
private String barCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("已分配数量")
|
|
||||||
@Excel(name = "已分配数量")
|
|
||||||
private BigDecimal alreadyAllocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("本次分配数量")
|
|
||||||
@Excel(name = "本次分配数量")
|
|
||||||
@TableField(exist = false)
|
|
||||||
private BigDecimal nowAllocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配数量")
|
|
||||||
@Excel(name = "分配数量")
|
|
||||||
private BigDecimal allocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("拣货数量")
|
|
||||||
@Excel(name = "拣货数量")
|
|
||||||
private BigDecimal pickingQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核数量")
|
|
||||||
@Excel(name = "复核数量")
|
|
||||||
private BigDecimal checkQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("净重 单位：千克")
|
|
||||||
@Excel(name = "净重 单位：千克")
|
|
||||||
private BigDecimal weightLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积 单位：立方米")
|
|
||||||
@Excel(name = "体积 单位：立方米")
|
|
||||||
private BigDecimal volumeLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格id")
|
|
||||||
@Excel(name = "包装规格id")
|
|
||||||
private Long packId;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格编码")
|
|
||||||
@Excel(name = "包装规格编码")
|
|
||||||
private String packCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装规格名称")
|
|
||||||
@Excel(name = "包装规格名称")
|
|
||||||
private String packName;
|
|
||||||
|
|
||||||
@ApiModelProperty("包装详情id")
|
|
||||||
@Excel(name = "包装详情id")
|
|
||||||
private Long packDetailId;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位代码：EA IP CS PL OT")
|
|
||||||
@Excel(name = "单位代码：EA IP CS PL OT")
|
|
||||||
private String unitCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位名称")
|
|
||||||
@Excel(name = "单位名称")
|
|
||||||
private String unitName;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位数量")
|
|
||||||
@Excel(name = "单位数量")
|
|
||||||
private BigDecimal unitNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料仓库控制信息id")
|
|
||||||
@Excel(name = "物料仓库控制信息id")
|
|
||||||
private Long materialWarehouseControlId;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否序列号管理: 1-是 2-否")
|
|
||||||
@Excel(name = "是否序列号管理: 1-是 2-否")
|
|
||||||
private Integer serialNumberManage;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料库存id")
|
|
||||||
@Excel(name = "物料库存id")
|
|
||||||
private Long materialInventoryId;
|
|
||||||
|
|
||||||
@ApiModelProperty("批次号")
|
|
||||||
@Excel(name = "批次号")
|
|
||||||
private String batchNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态编码")
|
|
||||||
@Excel(name = "物料状态编码")
|
|
||||||
private String materialStatusCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料状态名称")
|
|
||||||
@Excel(name = "物料状态名称")
|
|
||||||
private String materialStatusName;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器id")
|
|
||||||
@Excel(name = "容器id")
|
|
||||||
private Long containerId;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器编码")
|
|
||||||
@Excel(name = "容器编码")
|
|
||||||
private String containerCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型 数据字典")
|
|
||||||
@Excel(name = "容器类型 数据字典")
|
|
||||||
private String containerType;
|
|
||||||
|
|
||||||
@ApiModelProperty("容器类型名称 数据字典")
|
|
||||||
@Excel(name = "容器类型名称 数据字典")
|
|
||||||
private String containerTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配仓库编码")
|
|
||||||
@Excel(name = "分配仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库区id")
|
|
||||||
@Excel(name = "分配库区id")
|
|
||||||
private Long storageSectionId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库区编码")
|
|
||||||
@Excel(name = "分配库区编码")
|
|
||||||
private String storageCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库区名称")
|
|
||||||
@Excel(name = "分配库区名称")
|
|
||||||
private String storageName;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库位id")
|
|
||||||
@Excel(name = "分配库位id")
|
|
||||||
private Long storageLocationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库位编码")
|
|
||||||
@Excel(name = "分配库位编码")
|
|
||||||
private String storageLocationCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配库位名称")
|
|
||||||
@Excel(name = "分配库位名称")
|
|
||||||
private String storageLocationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("层级深度，从一级开始递增")
|
|
||||||
private Integer level;
|
|
||||||
|
|
||||||
@ApiModelProperty("父级唯一Id")
|
|
||||||
private Long parentUniqueId;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否允许修改: 1-是 2-否 分配后 不再支持修改")
|
|
||||||
@Excel(name = "是否允许修改: 1-是 2-否")
|
|
||||||
private Integer allowModify;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否生成拣货单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否生成拣货单: 1-是 2-否")
|
|
||||||
private Integer genPickingOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 商品名称
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("商品名称")
|
|
||||||
@Excel(name = "商品名称")
|
|
||||||
private String commodityName;
|
|
||||||
/**
|
|
||||||
* 商品编码
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("商品编码")
|
|
||||||
@Excel(name = "商品编码")
|
|
||||||
private String commodityNo;
|
|
||||||
/**
|
|
||||||
* 料号
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("料号")
|
|
||||||
@Excel(name = "料号")
|
|
||||||
private String materialNo;
|
|
||||||
/**
|
|
||||||
* 规格型号
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("规格型号")
|
|
||||||
@Excel(name = "规格型号")
|
|
||||||
private String specificationModel;
|
|
||||||
/**
|
|
||||||
* 商品SKU码
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("商品SKU码")
|
|
||||||
@Excel(name = "商品SKU码")
|
|
||||||
private String skucode;
|
|
||||||
/**
|
|
||||||
* Invoice No
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("Invoice No")
|
|
||||||
@Excel(name = "Invoice No")
|
|
||||||
private String invoiceNo;
|
|
||||||
/**
|
|
||||||
* 升
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("升")
|
|
||||||
@Excel(name = "升")
|
|
||||||
private String liter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 尺寸
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("尺寸")
|
|
||||||
@Excel(name = "尺寸")
|
|
||||||
private String size;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 申报单位
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("申报单位")
|
|
||||||
@Excel(name = "申报单位")
|
|
||||||
private String declareUnit;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Batch Ref NO’s
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("Batch Ref NO’s")
|
|
||||||
@Excel(name = "Batch Ref NO’s")
|
|
||||||
private String batchRefNo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sheet Ref NO’s
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("Sheet Ref NO’s")
|
|
||||||
@Excel(name = "Sheet Ref NO’s")
|
|
||||||
private String sheetRefNo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 原产国
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("原产国")
|
|
||||||
@Excel(name = "原产国")
|
|
||||||
private String countryOfOrigin;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 箱号/卡板号
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("箱号/卡板号")
|
|
||||||
@Excel(name = "箱号/卡板号")
|
|
||||||
private String boxPalletNo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 币制
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("币制")
|
|
||||||
@Excel(name = "币制")
|
|
||||||
private String currency;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 申报数量
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("申报数量")
|
|
||||||
@Excel(name = "申报数量")
|
|
||||||
private BigDecimal declareQuantity;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 箱数
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("箱数")
|
|
||||||
@Excel(name = "箱数")
|
|
||||||
private BigDecimal caseCount;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 件数
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("件数")
|
|
||||||
@Excel(name = "件数")
|
|
||||||
private BigDecimal pieceCount;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 出库数量
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("出库数量")
|
|
||||||
@Excel(name = "出库数量")
|
|
||||||
private BigDecimal outboundQuantity;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总净重(KG)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总净重(KG)")
|
|
||||||
@Excel(name = "总净重(KG)")
|
|
||||||
private BigDecimal totalNetWeight;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总毛重(KG)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总毛重(KG)")
|
|
||||||
@Excel(name = "总毛重(KG)")
|
|
||||||
private BigDecimal totalGrossWeight;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总体积(CBM)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总体积(CBM)")
|
|
||||||
@Excel(name = "总体积(CBM)")
|
|
||||||
private BigDecimal totalVolume;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总面积(SQM)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总面积(SQM)")
|
|
||||||
@Excel(name = "总面积(SQM)")
|
|
||||||
private BigDecimal totalArea;
|
|
||||||
/**
|
|
||||||
* 总价
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("总价")
|
|
||||||
@Excel(name = "总价")
|
|
||||||
private BigDecimal totalAmount;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 单位
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("单位")
|
|
||||||
@Excel(name = "单位")
|
|
||||||
private String unit;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性1")
|
|
||||||
@Excel(name = "扩展属性1")
|
|
||||||
@TableField("ext_attr_1")
|
|
||||||
private String extAttr1;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性2")
|
|
||||||
@Excel(name = "扩展属性2")
|
|
||||||
@TableField("ext_attr_2")
|
|
||||||
private String extAttr2;
|
|
||||||
|
|
||||||
@ApiModelProperty("生产日期")
|
|
||||||
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date productionDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("过期日期")
|
|
||||||
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date expiryDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("存货日期")
|
|
||||||
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date inventoryDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性3")
|
|
||||||
@Excel(name = "扩展属性3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@TableField("ext_attr_3")
|
|
||||||
private Date extAttr3;
|
|
||||||
|
|
||||||
@ApiModelProperty("扩展属性4")
|
|
||||||
@Excel(name = "扩展属性4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@TableField("ext_attr_4")
|
|
||||||
private Date extAttr4;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 库存数量（仅用于前端展示，从material_inventory表中带出）
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("分配时库存数量")
|
|
||||||
private BigDecimal inventoryQuantity;
|
|
||||||
|
|
||||||
@TableField(exist = false)
|
|
||||||
private BigDecimal actualQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总净重(KG)")
|
|
||||||
@Excel(name = "复核总净重(KG)")
|
|
||||||
private BigDecimal checkNetWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总毛重(KG)")
|
|
||||||
@Excel(name = "复核总毛重(KG)")
|
|
||||||
private BigDecimal checkGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总体积(CBM)")
|
|
||||||
@Excel(name = "复核总体积(CBM)")
|
|
||||||
private BigDecimal checkVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核总面积(SQM)")
|
|
||||||
@Excel(name = "复核总面积(SQM)")
|
|
||||||
private BigDecimal checkArea;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否已分配")
|
|
||||||
@Excel(name = "是否已分配")
|
|
||||||
private String isAllocated;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("合同收费")
|
|
||||||
@Excel(name = "合同收费")
|
|
||||||
private BigDecimal contractFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("每月仓租")
|
|
||||||
@Excel(name = "每月仓租")
|
|
||||||
private BigDecimal monthlyWarehouseFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("半月仓租")
|
|
||||||
@Excel(name = "半月仓租")
|
|
||||||
private BigDecimal halfMonthWhFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("折扣(%)")
|
|
||||||
@Excel(name = "折扣(%)")
|
|
||||||
private BigDecimal discountRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("单体积(CBM)")
|
|
||||||
@Excel(name = "单体积(CBM)")
|
|
||||||
private BigDecimal singleVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("单毛重(KG)")
|
|
||||||
@Excel(name = "单毛重(KG)")
|
|
||||||
private BigDecimal singleGrossWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty("lot编号")
|
|
||||||
@Excel(name = "lot编号")
|
|
||||||
private String lotNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单号")
|
|
||||||
@Excel(name = "入库单号")
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存单位")
|
|
||||||
@Excel(name = "库存单位")
|
|
||||||
private String stockUnit;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存数量")
|
|
||||||
@Excel(name = "库存数量")
|
|
||||||
private BigDecimal stockQuantity;
|
|
||||||
}
|
|
||||||
@@ -1,367 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 入库单对象 stock_in_order
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-21
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class StockInOrder extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long inOrderId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库id")
|
|
||||||
@Excel(name = "仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库编码")
|
|
||||||
@Excel(name = "仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("通知单号")
|
|
||||||
@Excel(name = "通知单号")
|
|
||||||
private String noticeNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单号")
|
|
||||||
@Excel(name = "入库单号")
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
|
|
||||||
@Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
@Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
private Integer auditStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核备注")
|
|
||||||
@Excel(name = "入库单审核备注")
|
|
||||||
private String auditRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核人")
|
|
||||||
@Excel(name = "入库单审核人")
|
|
||||||
private Long auditBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核人姓名")
|
|
||||||
@Excel(name = "入库单审核人姓名")
|
|
||||||
private String auditByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "入库单审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date auditTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主id")
|
|
||||||
@Excel(name = "货主id")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主编码")
|
|
||||||
@Excel(name = "货主编码")
|
|
||||||
private String shipperCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主名称")
|
|
||||||
@Excel(name = "货主名称")
|
|
||||||
private String shipperName;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单类型编码")
|
|
||||||
@Excel(name = "入库单类型编码")
|
|
||||||
private String orderTypeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单类型名称")
|
|
||||||
@Excel(name = "入库单类型名称")
|
|
||||||
private String orderTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应商id")
|
|
||||||
@Excel(name = "供应商id")
|
|
||||||
private Long supplierId;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应商编码")
|
|
||||||
@Excel(name = "供应商编码")
|
|
||||||
private String supplierCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应商名称")
|
|
||||||
@Excel(name = "供应商名称")
|
|
||||||
private String supplierName;
|
|
||||||
|
|
||||||
@ApiModelProperty("预计到货时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "预计到货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date expectTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应链订单号")
|
|
||||||
@Excel(name = "供应链订单号")
|
|
||||||
private String supplyChainNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别编码")
|
|
||||||
@Excel(name = "优先级别编码")
|
|
||||||
private String priorityLevelCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别名称")
|
|
||||||
@Excel(name = "优先级别名称")
|
|
||||||
private String priorityLevelName;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否直接入库: 1-是 2-否")
|
|
||||||
@Excel(name = "是否直接入库: 1-是 2-否")
|
|
||||||
private Integer directWarehouse;
|
|
||||||
|
|
||||||
@ApiModelProperty("附件url")
|
|
||||||
@Excel(name = "附件url")
|
|
||||||
private String annexUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料种数")
|
|
||||||
@Excel(name = "物料种数")
|
|
||||||
private Integer materialQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("净重 单位：千克")
|
|
||||||
@Excel(name = "净重 单位：千克")
|
|
||||||
private BigDecimal weightLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积 单位：立方米")
|
|
||||||
@Excel(name = "体积 单位：立方米")
|
|
||||||
private BigDecimal volumeLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否取消订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否取消订单: 1-是 2-否")
|
|
||||||
private Integer cancelOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单备注")
|
|
||||||
@Excel(name = "取消订单备注")
|
|
||||||
private String cancelRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人")
|
|
||||||
@Excel(name = "取消订单人")
|
|
||||||
private Long cancelBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人姓名")
|
|
||||||
@Excel(name = "取消订单人姓名")
|
|
||||||
private String cancelByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date cancelTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否关闭订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否关闭订单: 1-是 2-否")
|
|
||||||
private Integer closeOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单备注")
|
|
||||||
@Excel(name = "关闭订单备注")
|
|
||||||
private String closeRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人")
|
|
||||||
@Excel(name = "关闭订单人")
|
|
||||||
private Long closeBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人姓名")
|
|
||||||
@Excel(name = "关闭订单人姓名")
|
|
||||||
private String closeByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date closeTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单来源: 1-正常录入 2-通知单生成 3-无单收货")
|
|
||||||
@Excel(name = "入库单来源: 1-正常录入 2-通知单生成 3-无单收货")
|
|
||||||
private Integer orderSource;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("调度单号")
|
|
||||||
private String mobilizeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
// ========== 报关相关字段 ==========
|
|
||||||
@ApiModelProperty("To")
|
|
||||||
@Excel(name = "To")
|
|
||||||
@TableField(value = "\"TO\"")
|
|
||||||
private String to;
|
|
||||||
|
|
||||||
@ApiModelProperty("联系人")
|
|
||||||
@Excel(name = "联系人")
|
|
||||||
private String contactPerson;
|
|
||||||
|
|
||||||
@ApiModelProperty("车型及车牌")
|
|
||||||
@Excel(name = "车型及车牌")
|
|
||||||
private String vehicleInfo;
|
|
||||||
|
|
||||||
@ApiModelProperty("委托编号NO")
|
|
||||||
@Excel(name = "委托编号NO")
|
|
||||||
private String consignmentNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("Tel")
|
|
||||||
@Excel(name = "Tel")
|
|
||||||
private String tel;
|
|
||||||
|
|
||||||
@ApiModelProperty("司机签名")
|
|
||||||
@Excel(name = "司机签名")
|
|
||||||
private String driverSignature;
|
|
||||||
|
|
||||||
@ApiModelProperty("Fax")
|
|
||||||
@Excel(name = "Fax")
|
|
||||||
private String fax;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报地关区")
|
|
||||||
@Excel(name = "申报地关区")
|
|
||||||
private String declarationArea;
|
|
||||||
|
|
||||||
@ApiModelProperty("生产商")
|
|
||||||
@Excel(name = "生产商")
|
|
||||||
private String manufacturer;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关员姓名及联系方式")
|
|
||||||
@Excel(name = "报关员姓名及联系方式")
|
|
||||||
private String customsBrokerInfo;
|
|
||||||
|
|
||||||
@ApiModelProperty("送货地址")
|
|
||||||
@Excel(name = "送货地址")
|
|
||||||
private String deliveryAddress;
|
|
||||||
|
|
||||||
@ApiModelProperty("进出境关别")
|
|
||||||
@Excel(name = "进出境关别")
|
|
||||||
private String entryExitCustoms;
|
|
||||||
|
|
||||||
@ApiModelProperty("起运/运抵国(地区)")
|
|
||||||
@Excel(name = "起运/运抵国(地区)")
|
|
||||||
private String originDestinationCountry;
|
|
||||||
|
|
||||||
@ApiModelProperty("承运商")
|
|
||||||
@Excel(name = "承运商")
|
|
||||||
private String carrier;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜号")
|
|
||||||
@Excel(name = "柜号")
|
|
||||||
private String containerNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输方式")
|
|
||||||
@Excel(name = "运输方式")
|
|
||||||
private String transportMethod;
|
|
||||||
|
|
||||||
@ApiModelProperty("监管方式")
|
|
||||||
@Excel(name = "监管方式")
|
|
||||||
private String supervisionMethod;
|
|
||||||
|
|
||||||
@ApiModelProperty("海关是否查验货物")
|
|
||||||
@Excel(name = "海关是否查验货物")
|
|
||||||
private Integer customsInspection;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否需要报关")
|
|
||||||
@Excel(name = "是否需要报关")
|
|
||||||
private Integer needCustomsDeclaration;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否需要运输")
|
|
||||||
@Excel(name = "是否需要运输")
|
|
||||||
private Integer needTransport;
|
|
||||||
|
|
||||||
@ApiModelProperty("入仓日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "入仓日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date warehouseDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("完成时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date completionTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("下单日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "下单日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date orderDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务单号")
|
|
||||||
@Excel(name = "业务单号")
|
|
||||||
private String businessOrderNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务类型")
|
|
||||||
@Excel(name = "业务类型")
|
|
||||||
private String businessType;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人")
|
|
||||||
@Excel(name = "制单人")
|
|
||||||
private String documentCreator;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人名称")
|
|
||||||
@Excel(name = "制单人名称")
|
|
||||||
private String documentCreatorName;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date documentDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单状态")
|
|
||||||
@Excel(name = "订单状态")
|
|
||||||
private String orderStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("oms入库单id")
|
|
||||||
@Excel(name = "oms入库单id")
|
|
||||||
private String omsStockInOrderId;
|
|
||||||
@ApiModelProperty("结算币种")
|
|
||||||
private String settlementCurrency;
|
|
||||||
@ApiModelProperty("业务员ID")
|
|
||||||
private String salesmanId;
|
|
||||||
@ApiModelProperty("业务员名称")
|
|
||||||
private String salesmanName;
|
|
||||||
@Excel(name = "附件url")
|
|
||||||
private String pictureUrl;
|
|
||||||
}
|
|
||||||
@@ -1,365 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 入库单对象 stock_in_order
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-21
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class StockInOrderTZPD extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long inOrderId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库id")
|
|
||||||
@Excel(name = "仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库编码")
|
|
||||||
@Excel(name = "仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("通知单号")
|
|
||||||
@Excel(name = "通知单号")
|
|
||||||
private String noticeNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单号")
|
|
||||||
@Excel(name = "入库单号")
|
|
||||||
private String inOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
|
|
||||||
@Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
@Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
private Integer auditStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核备注")
|
|
||||||
@Excel(name = "入库单审核备注")
|
|
||||||
private String auditRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核人")
|
|
||||||
@Excel(name = "入库单审核人")
|
|
||||||
private Long auditBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核人姓名")
|
|
||||||
@Excel(name = "入库单审核人姓名")
|
|
||||||
private String auditByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单审核时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "入库单审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date auditTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主id")
|
|
||||||
@Excel(name = "货主id")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主编码")
|
|
||||||
@Excel(name = "货主编码")
|
|
||||||
private String shipperCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主名称")
|
|
||||||
@Excel(name = "货主名称")
|
|
||||||
private String shipperName;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单类型编码")
|
|
||||||
@Excel(name = "入库单类型编码")
|
|
||||||
private String orderTypeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单类型名称")
|
|
||||||
@Excel(name = "入库单类型名称")
|
|
||||||
private String orderTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应商id")
|
|
||||||
@Excel(name = "供应商id")
|
|
||||||
private Long supplierId;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应商编码")
|
|
||||||
@Excel(name = "供应商编码")
|
|
||||||
private String supplierCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应商名称")
|
|
||||||
@Excel(name = "供应商名称")
|
|
||||||
private String supplierName;
|
|
||||||
|
|
||||||
@ApiModelProperty("预计到货时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "预计到货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date expectTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应链订单号")
|
|
||||||
@Excel(name = "供应链订单号")
|
|
||||||
private String supplyChainNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别编码")
|
|
||||||
@Excel(name = "优先级别编码")
|
|
||||||
private String priorityLevelCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别名称")
|
|
||||||
@Excel(name = "优先级别名称")
|
|
||||||
private String priorityLevelName;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否直接入库: 1-是 2-否")
|
|
||||||
@Excel(name = "是否直接入库: 1-是 2-否")
|
|
||||||
private Integer directWarehouse;
|
|
||||||
|
|
||||||
@ApiModelProperty("附件url")
|
|
||||||
@Excel(name = "附件url")
|
|
||||||
private String annexUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料种数")
|
|
||||||
@Excel(name = "物料种数")
|
|
||||||
private Integer materialQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("净重 单位：千克")
|
|
||||||
@Excel(name = "净重 单位：千克")
|
|
||||||
private BigDecimal weightLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积 单位：立方米")
|
|
||||||
@Excel(name = "体积 单位：立方米")
|
|
||||||
private BigDecimal volumeLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否取消订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否取消订单: 1-是 2-否")
|
|
||||||
private Integer cancelOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单备注")
|
|
||||||
@Excel(name = "取消订单备注")
|
|
||||||
private String cancelRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人")
|
|
||||||
@Excel(name = "取消订单人")
|
|
||||||
private Long cancelBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人姓名")
|
|
||||||
@Excel(name = "取消订单人姓名")
|
|
||||||
private String cancelByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date cancelTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否关闭订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否关闭订单: 1-是 2-否")
|
|
||||||
private Integer closeOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单备注")
|
|
||||||
@Excel(name = "关闭订单备注")
|
|
||||||
private String closeRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人")
|
|
||||||
@Excel(name = "关闭订单人")
|
|
||||||
private Long closeBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人姓名")
|
|
||||||
@Excel(name = "关闭订单人姓名")
|
|
||||||
private String closeByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date closeTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("入库单来源: 1-正常录入 2-通知单生成 3-无单收货")
|
|
||||||
@Excel(name = "入库单来源: 1-正常录入 2-通知单生成 3-无单收货")
|
|
||||||
private Integer orderSource;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("调度单号")
|
|
||||||
private String mobilizeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
// ========== 报关相关字段 ==========
|
|
||||||
@ApiModelProperty("To")
|
|
||||||
@Excel(name = "To")
|
|
||||||
@TableField(value = "\"TO\"")
|
|
||||||
private String to;
|
|
||||||
|
|
||||||
@ApiModelProperty("联系人")
|
|
||||||
@Excel(name = "联系人")
|
|
||||||
private String contactPerson;
|
|
||||||
|
|
||||||
@ApiModelProperty("车型及车牌")
|
|
||||||
@Excel(name = "车型及车牌")
|
|
||||||
private String vehicleInfo;
|
|
||||||
|
|
||||||
@ApiModelProperty("委托编号NO")
|
|
||||||
@Excel(name = "委托编号NO")
|
|
||||||
private String consignmentNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("Tel")
|
|
||||||
@Excel(name = "Tel")
|
|
||||||
private String tel;
|
|
||||||
|
|
||||||
@ApiModelProperty("司机签名")
|
|
||||||
@Excel(name = "司机签名")
|
|
||||||
private String driverSignature;
|
|
||||||
|
|
||||||
@ApiModelProperty("Fax")
|
|
||||||
@Excel(name = "Fax")
|
|
||||||
private String fax;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报地关区")
|
|
||||||
@Excel(name = "申报地关区")
|
|
||||||
private String declarationArea;
|
|
||||||
|
|
||||||
@ApiModelProperty("生产商")
|
|
||||||
@Excel(name = "生产商")
|
|
||||||
private String manufacturer;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关员姓名及联系方式")
|
|
||||||
@Excel(name = "报关员姓名及联系方式")
|
|
||||||
private String customsBrokerInfo;
|
|
||||||
|
|
||||||
@ApiModelProperty("送货地址")
|
|
||||||
@Excel(name = "送货地址")
|
|
||||||
private String deliveryAddress;
|
|
||||||
|
|
||||||
@ApiModelProperty("进出境关别")
|
|
||||||
@Excel(name = "进出境关别")
|
|
||||||
private String entryExitCustoms;
|
|
||||||
|
|
||||||
@ApiModelProperty("起运/运抵国(地区)")
|
|
||||||
@Excel(name = "起运/运抵国(地区)")
|
|
||||||
private String originDestinationCountry;
|
|
||||||
|
|
||||||
@ApiModelProperty("承运商")
|
|
||||||
@Excel(name = "承运商")
|
|
||||||
private String carrier;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜号")
|
|
||||||
@Excel(name = "柜号")
|
|
||||||
private String containerNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输方式")
|
|
||||||
@Excel(name = "运输方式")
|
|
||||||
private String transportMethod;
|
|
||||||
|
|
||||||
@ApiModelProperty("监管方式")
|
|
||||||
@Excel(name = "监管方式")
|
|
||||||
private String supervisionMethod;
|
|
||||||
|
|
||||||
@ApiModelProperty("海关是否查验货物")
|
|
||||||
@Excel(name = "海关是否查验货物")
|
|
||||||
private Integer customsInspection;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否需要报关")
|
|
||||||
@Excel(name = "是否需要报关")
|
|
||||||
private Integer needCustomsDeclaration;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否需要运输")
|
|
||||||
@Excel(name = "是否需要运输")
|
|
||||||
private Integer needTransport;
|
|
||||||
|
|
||||||
@ApiModelProperty("入仓日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "入仓日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date warehouseDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("完成时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date completionTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("下单日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "下单日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date orderDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务单号")
|
|
||||||
@Excel(name = "业务单号")
|
|
||||||
private String businessOrderNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务类型")
|
|
||||||
@Excel(name = "业务类型")
|
|
||||||
private String businessType;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人")
|
|
||||||
@Excel(name = "制单人")
|
|
||||||
private String documentCreator;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人名称")
|
|
||||||
@Excel(name = "制单人名称")
|
|
||||||
private String documentCreatorName;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date documentDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单状态")
|
|
||||||
@Excel(name = "订单状态")
|
|
||||||
private String orderStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("oms入库单id")
|
|
||||||
@Excel(name = "oms入库单id")
|
|
||||||
private String omsStockInOrderId;
|
|
||||||
@ApiModelProperty("结算币种")
|
|
||||||
private String settlementCurrency;
|
|
||||||
@ApiModelProperty("业务员ID")
|
|
||||||
private String salesmanId;
|
|
||||||
@ApiModelProperty("业务员名称")
|
|
||||||
private String salesmanName;
|
|
||||||
}
|
|
||||||
@@ -1,408 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 出库单对象 stock_out_order
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-28
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class StockOutOrder extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long outOrderId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("通知单号")
|
|
||||||
@Excel(name = "通知单号")
|
|
||||||
private String noticeNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单号")
|
|
||||||
@Excel(name = "出库单号")
|
|
||||||
private String outOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
|
|
||||||
@Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
@Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
private Integer auditStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核备注")
|
|
||||||
@Excel(name = "出库单审核备注")
|
|
||||||
private String auditRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核人")
|
|
||||||
@Excel(name = "出库单审核人")
|
|
||||||
private Long auditBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核人姓名")
|
|
||||||
@Excel(name = "出库单审核人姓名")
|
|
||||||
private String auditByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date auditTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库id")
|
|
||||||
@Excel(name = "仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库编码")
|
|
||||||
@Excel(name = "仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主id")
|
|
||||||
@Excel(name = "货主id")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主编码")
|
|
||||||
@Excel(name = "货主编码")
|
|
||||||
private String shipperCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主名称")
|
|
||||||
@Excel(name = "货主名称")
|
|
||||||
private String shipperName;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单类型编码")
|
|
||||||
@Excel(name = "出库单类型编码")
|
|
||||||
private String orderTypeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单类型名称")
|
|
||||||
@Excel(name = "出库单类型名称")
|
|
||||||
private String orderTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户id")
|
|
||||||
@Excel(name = "客户id")
|
|
||||||
private Long customerId;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户编码")
|
|
||||||
@Excel(name = "客户编码")
|
|
||||||
private String customerCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户名称")
|
|
||||||
@Excel(name = "客户名称")
|
|
||||||
private String customerName;
|
|
||||||
|
|
||||||
@ApiModelProperty("预计出货时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date expectTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应链订单号")
|
|
||||||
@Excel(name = "供应链订单号")
|
|
||||||
private String supplyChainNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别编码")
|
|
||||||
@Excel(name = "优先级别编码")
|
|
||||||
private String priorityLevelCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别名称")
|
|
||||||
@Excel(name = "优先级别名称")
|
|
||||||
private String priorityLevelName;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否直接出库: 1-是 2-否")
|
|
||||||
@Excel(name = "是否直接出库: 1-是 2-否")
|
|
||||||
private Integer directWarehouse;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否复核: 1-是 2-否")
|
|
||||||
@Excel(name = "是否复核: 1-是 2-否")
|
|
||||||
private Integer review;
|
|
||||||
|
|
||||||
@ApiModelProperty("附件url")
|
|
||||||
@Excel(name = "附件url")
|
|
||||||
private String annexUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料种数")
|
|
||||||
@Excel(name = "物料种数")
|
|
||||||
private Integer materialQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("净重 单位：千克")
|
|
||||||
@Excel(name = "净重 单位：千克")
|
|
||||||
private BigDecimal weightLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积 单位：立方米")
|
|
||||||
@Excel(name = "体积 单位：立方米")
|
|
||||||
private BigDecimal volumeLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配数量")
|
|
||||||
@Excel(name = "分配数量")
|
|
||||||
private BigDecimal allocationQuantity;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("已生成拣货单数量")
|
|
||||||
@Excel(name = "已生成拣货单分配数量")
|
|
||||||
private BigDecimal alreadyAllocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("拣货数量")
|
|
||||||
@Excel(name = "拣货数量")
|
|
||||||
private BigDecimal pickingQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核数量")
|
|
||||||
@Excel(name = "复核数量")
|
|
||||||
private BigDecimal checkQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否取消订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否取消订单: 1-是 2-否")
|
|
||||||
private Integer cancelOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单备注")
|
|
||||||
@Excel(name = "取消订单备注")
|
|
||||||
private String cancelRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人")
|
|
||||||
@Excel(name = "取消订单人")
|
|
||||||
private Long cancelBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人姓名")
|
|
||||||
@Excel(name = "取消订单人姓名")
|
|
||||||
private String cancelByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date cancelTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否关闭订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否关闭订单: 1-是 2-否")
|
|
||||||
private Integer closeOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单备注")
|
|
||||||
@Excel(name = "关闭订单备注")
|
|
||||||
private String closeRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人")
|
|
||||||
@Excel(name = "关闭订单人")
|
|
||||||
private Long closeBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人姓名")
|
|
||||||
@Excel(name = "关闭订单人姓名")
|
|
||||||
private String closeByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date closeTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核状态: 1-未复核 2-复核中 3-已复核")
|
|
||||||
@Excel(name = "复核状态: 1-未复核 2-复核中 3-已复核")
|
|
||||||
private Integer checkStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核任务是否下发: 1-是 2-否")
|
|
||||||
@Excel(name = "复核任务是否下发: 1-是 2-否")
|
|
||||||
private Integer checkTaskDistribution;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核任务下发时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date checkTaskDistributionTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核作业人用户ID")
|
|
||||||
@Excel(name = "复核作业人用户ID")
|
|
||||||
private Long checkOperatorsBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核作业人姓名")
|
|
||||||
@Excel(name = "复核作业人姓名")
|
|
||||||
private String checkOperatorsName;
|
|
||||||
|
|
||||||
@ApiModelProperty("调度单号")
|
|
||||||
@Excel(name = "调度单号")
|
|
||||||
private String mobilizeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
@ApiModelProperty("to")
|
|
||||||
@Excel(name = "to")
|
|
||||||
@TableField(value = "\"TO\"")
|
|
||||||
private String to;
|
|
||||||
|
|
||||||
@ApiModelProperty("联系人")
|
|
||||||
@Excel(name = "联系人")
|
|
||||||
private String contactPerson;
|
|
||||||
|
|
||||||
@ApiModelProperty("车型及车牌")
|
|
||||||
@Excel(name = "车型及车牌")
|
|
||||||
private String vehicleModelPlate;
|
|
||||||
|
|
||||||
@ApiModelProperty("委托编号")
|
|
||||||
@Excel(name = "委托编号")
|
|
||||||
private String entrustNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("Tel")
|
|
||||||
@Excel(name = "Tel")
|
|
||||||
private String tel;
|
|
||||||
|
|
||||||
@ApiModelProperty("司机签名")
|
|
||||||
@Excel(name = "司机签名")
|
|
||||||
private String driverSign;
|
|
||||||
|
|
||||||
@ApiModelProperty("Fax")
|
|
||||||
@Excel(name = "Fax")
|
|
||||||
private String fax;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报地关区")
|
|
||||||
@Excel(name = "申报地关区")
|
|
||||||
private String declareCustoms;
|
|
||||||
|
|
||||||
@ApiModelProperty("生产商")
|
|
||||||
@Excel(name = "生产商")
|
|
||||||
private String manufacturer;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关员姓名及联系方式")
|
|
||||||
@Excel(name = "报关员姓名及联系方式")
|
|
||||||
private String customsDeclarerInfo;
|
|
||||||
|
|
||||||
@ApiModelProperty("送货地址")
|
|
||||||
@Excel(name = "送货地址")
|
|
||||||
private String deliveryAddr;
|
|
||||||
|
|
||||||
@ApiModelProperty("进出境关别")
|
|
||||||
@Excel(name = "进出境关别")
|
|
||||||
private String entryExitCustoms;
|
|
||||||
|
|
||||||
@ApiModelProperty("起运/运抵国(地区）")
|
|
||||||
@Excel(name = "起运/运抵国(地区）")
|
|
||||||
private String departureArrivalCountry;
|
|
||||||
|
|
||||||
@ApiModelProperty("承运商")
|
|
||||||
@Excel(name = "承运商")
|
|
||||||
private String carrier;
|
|
||||||
|
|
||||||
@ApiModelProperty("承运商名称")
|
|
||||||
@Excel(name = "承运商名称")
|
|
||||||
private String carrierName;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜号")
|
|
||||||
@Excel(name = "柜号")
|
|
||||||
private String containerNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜")
|
|
||||||
@Excel(name = "柜")
|
|
||||||
private String containerNoName;
|
|
||||||
|
|
||||||
@ApiModelProperty("出仓日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date outboundDate;
|
|
||||||
@ApiModelProperty("完成时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date completeTime;
|
|
||||||
@ApiModelProperty("orderDate")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date orderDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输方式")
|
|
||||||
@Excel(name = "运输方式")
|
|
||||||
private String transportModeCode;
|
|
||||||
@ApiModelProperty("运输方式")
|
|
||||||
@Excel(name = "运输方式")
|
|
||||||
private String transportModeName;
|
|
||||||
@ApiModelProperty("监管方式")
|
|
||||||
@Excel(name = "监管方式")
|
|
||||||
private String supervisionModeCode;
|
|
||||||
@ApiModelProperty("监管方式")
|
|
||||||
@Excel(name = "监管方式")
|
|
||||||
private String supervisionModeName;
|
|
||||||
@ApiModelProperty("海关是否查验货物")
|
|
||||||
@Excel(name = "海关是否查验货物")
|
|
||||||
private String customsInspectionFlag;
|
|
||||||
@ApiModelProperty("是否需要报关")
|
|
||||||
@Excel(name = "是否需要报关")
|
|
||||||
private String needDeclareFlag;
|
|
||||||
@ApiModelProperty("是否需要运输")
|
|
||||||
@Excel(name = "是否需要运输")
|
|
||||||
private String needTransportFlag;
|
|
||||||
@ApiModelProperty("app上传的图片")
|
|
||||||
private String pictureApp;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务单号")
|
|
||||||
@Excel(name = "业务单号")
|
|
||||||
private String businessOrderNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务类型")
|
|
||||||
@Excel(name = "业务类型")
|
|
||||||
private String businessType;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人")
|
|
||||||
@Excel(name = "制单人")
|
|
||||||
private String documentCreator;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人名称")
|
|
||||||
@Excel(name = "制单人名称")
|
|
||||||
private String documentCreatorName;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date documentDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("结算币种")
|
|
||||||
private String settlementCurrency;
|
|
||||||
@ApiModelProperty("业务员ID")
|
|
||||||
private String salesmanId;
|
|
||||||
@ApiModelProperty("业务员名称")
|
|
||||||
private String salesmanName;
|
|
||||||
@ApiModelProperty("车次")
|
|
||||||
@Excel(name = "车次")
|
|
||||||
private Integer trainNo;
|
|
||||||
|
|
||||||
}
|
|
||||||
-405
@@ -1,405 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 出库单对象 stock_out_order
|
|
||||||
*
|
|
||||||
* @author gen
|
|
||||||
* @date 2024-05-28
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class StockOutOrderTZPD extends BaseVOEntity {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long outOrderId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
|
||||||
@Excel(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织名称")
|
|
||||||
@Excel(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty("一级组织表ID")
|
|
||||||
@Excel(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("通知单号")
|
|
||||||
@Excel(name = "通知单号")
|
|
||||||
private String noticeNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单号")
|
|
||||||
@Excel(name = "出库单号")
|
|
||||||
private String outOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
|
|
||||||
@Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
@Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
|
||||||
private Integer auditStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核备注")
|
|
||||||
@Excel(name = "出库单审核备注")
|
|
||||||
private String auditRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核人")
|
|
||||||
@Excel(name = "出库单审核人")
|
|
||||||
private Long auditBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核人姓名")
|
|
||||||
@Excel(name = "出库单审核人姓名")
|
|
||||||
private String auditByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date auditTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库id")
|
|
||||||
@Excel(name = "仓库id")
|
|
||||||
private Long warehouseId;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库编码")
|
|
||||||
@Excel(name = "仓库编码")
|
|
||||||
private String warehouseCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库名称")
|
|
||||||
@Excel(name = "仓库名称")
|
|
||||||
private String warehouseName;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主id")
|
|
||||||
@Excel(name = "货主id")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主编码")
|
|
||||||
@Excel(name = "货主编码")
|
|
||||||
private String shipperCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主名称")
|
|
||||||
@Excel(name = "货主名称")
|
|
||||||
private String shipperName;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单类型编码")
|
|
||||||
@Excel(name = "出库单类型编码")
|
|
||||||
private String orderTypeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("出库单类型名称")
|
|
||||||
@Excel(name = "出库单类型名称")
|
|
||||||
private String orderTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户id")
|
|
||||||
@Excel(name = "客户id")
|
|
||||||
private Long customerId;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户编码")
|
|
||||||
@Excel(name = "客户编码")
|
|
||||||
private String customerCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户名称")
|
|
||||||
@Excel(name = "客户名称")
|
|
||||||
private String customerName;
|
|
||||||
|
|
||||||
@ApiModelProperty("预计出货时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date expectTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("供应链订单号")
|
|
||||||
@Excel(name = "供应链订单号")
|
|
||||||
private String supplyChainNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别编码")
|
|
||||||
@Excel(name = "优先级别编码")
|
|
||||||
private String priorityLevelCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("优先级别名称")
|
|
||||||
@Excel(name = "优先级别名称")
|
|
||||||
private String priorityLevelName;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否直接出库: 1-是 2-否")
|
|
||||||
@Excel(name = "是否直接出库: 1-是 2-否")
|
|
||||||
private Integer directWarehouse;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否复核: 1-是 2-否")
|
|
||||||
@Excel(name = "是否复核: 1-是 2-否")
|
|
||||||
private Integer review;
|
|
||||||
|
|
||||||
@ApiModelProperty("附件url")
|
|
||||||
@Excel(name = "附件url")
|
|
||||||
private String annexUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty("物料种数")
|
|
||||||
@Excel(name = "物料种数")
|
|
||||||
private Integer materialQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("计划数量")
|
|
||||||
@Excel(name = "计划数量")
|
|
||||||
private BigDecimal quantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("净重 单位：千克")
|
|
||||||
@Excel(name = "净重 单位：千克")
|
|
||||||
private BigDecimal weightLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积 单位：立方米")
|
|
||||||
@Excel(name = "体积 单位：立方米")
|
|
||||||
private BigDecimal volumeLimit;
|
|
||||||
|
|
||||||
@ApiModelProperty("分配数量")
|
|
||||||
@Excel(name = "分配数量")
|
|
||||||
private BigDecimal allocationQuantity;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("已生成拣货单数量")
|
|
||||||
@Excel(name = "已生成拣货单分配数量")
|
|
||||||
private BigDecimal alreadyAllocationQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("拣货数量")
|
|
||||||
@Excel(name = "拣货数量")
|
|
||||||
private BigDecimal pickingQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核数量")
|
|
||||||
@Excel(name = "复核数量")
|
|
||||||
private BigDecimal checkQuantity;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否取消订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否取消订单: 1-是 2-否")
|
|
||||||
private Integer cancelOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单备注")
|
|
||||||
@Excel(name = "取消订单备注")
|
|
||||||
private String cancelRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人")
|
|
||||||
@Excel(name = "取消订单人")
|
|
||||||
private Long cancelBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单人姓名")
|
|
||||||
@Excel(name = "取消订单人姓名")
|
|
||||||
private String cancelByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("取消订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date cancelTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否关闭订单: 1-是 2-否")
|
|
||||||
@Excel(name = "是否关闭订单: 1-是 2-否")
|
|
||||||
private Integer closeOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单备注")
|
|
||||||
@Excel(name = "关闭订单备注")
|
|
||||||
private String closeRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人")
|
|
||||||
@Excel(name = "关闭订单人")
|
|
||||||
private Long closeBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单人姓名")
|
|
||||||
@Excel(name = "关闭订单人姓名")
|
|
||||||
private String closeByName;
|
|
||||||
|
|
||||||
@ApiModelProperty("关闭订单时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date closeTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核状态: 1-未复核 2-复核中 3-已复核")
|
|
||||||
@Excel(name = "复核状态: 1-未复核 2-复核中 3-已复核")
|
|
||||||
private Integer checkStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核任务是否下发: 1-是 2-否")
|
|
||||||
@Excel(name = "复核任务是否下发: 1-是 2-否")
|
|
||||||
private Integer checkTaskDistribution;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核任务下发时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date checkTaskDistributionTime;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核作业人用户ID")
|
|
||||||
@Excel(name = "复核作业人用户ID")
|
|
||||||
private Long checkOperatorsBy;
|
|
||||||
|
|
||||||
@ApiModelProperty("复核作业人姓名")
|
|
||||||
@Excel(name = "复核作业人姓名")
|
|
||||||
private String checkOperatorsName;
|
|
||||||
|
|
||||||
@ApiModelProperty("调度单号")
|
|
||||||
@Excel(name = "调度单号")
|
|
||||||
private String mobilizeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("备注")
|
|
||||||
@Excel(name = "备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单id")
|
|
||||||
private Long overStockId;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
@Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
|
|
||||||
private Integer overStockStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
|
|
||||||
@Excel(name = "越库类型：1-直接越库 2-分拨越库")
|
|
||||||
private Long overStockType;
|
|
||||||
|
|
||||||
@ApiModelProperty("to")
|
|
||||||
@Excel(name = "to")
|
|
||||||
@TableField(value = "\"TO\"")
|
|
||||||
private String to;
|
|
||||||
|
|
||||||
@ApiModelProperty("联系人")
|
|
||||||
@Excel(name = "联系人")
|
|
||||||
private String contactPerson;
|
|
||||||
|
|
||||||
@ApiModelProperty("车型及车牌")
|
|
||||||
@Excel(name = "车型及车牌")
|
|
||||||
private String vehicleModelPlate;
|
|
||||||
|
|
||||||
@ApiModelProperty("委托编号")
|
|
||||||
@Excel(name = "委托编号")
|
|
||||||
private String entrustNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("Tel")
|
|
||||||
@Excel(name = "Tel")
|
|
||||||
private String tel;
|
|
||||||
|
|
||||||
@ApiModelProperty("司机签名")
|
|
||||||
@Excel(name = "司机签名")
|
|
||||||
private String driverSign;
|
|
||||||
|
|
||||||
@ApiModelProperty("Fax")
|
|
||||||
@Excel(name = "Fax")
|
|
||||||
private String fax;
|
|
||||||
|
|
||||||
@ApiModelProperty("申报地关区")
|
|
||||||
@Excel(name = "申报地关区")
|
|
||||||
private String declareCustoms;
|
|
||||||
|
|
||||||
@ApiModelProperty("生产商")
|
|
||||||
@Excel(name = "生产商")
|
|
||||||
private String manufacturer;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关员姓名及联系方式")
|
|
||||||
@Excel(name = "报关员姓名及联系方式")
|
|
||||||
private String customsDeclarerInfo;
|
|
||||||
|
|
||||||
@ApiModelProperty("送货地址")
|
|
||||||
@Excel(name = "送货地址")
|
|
||||||
private String deliveryAddr;
|
|
||||||
|
|
||||||
@ApiModelProperty("进出境关别")
|
|
||||||
@Excel(name = "进出境关别")
|
|
||||||
private String entryExitCustoms;
|
|
||||||
|
|
||||||
@ApiModelProperty("起运/运抵国(地区）")
|
|
||||||
@Excel(name = "起运/运抵国(地区）")
|
|
||||||
private String departureArrivalCountry;
|
|
||||||
|
|
||||||
@ApiModelProperty("承运商")
|
|
||||||
@Excel(name = "承运商")
|
|
||||||
private String carrier;
|
|
||||||
|
|
||||||
@ApiModelProperty("承运商名称")
|
|
||||||
@Excel(name = "承运商名称")
|
|
||||||
private String carrierName;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜号")
|
|
||||||
@Excel(name = "柜号")
|
|
||||||
private String containerNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜")
|
|
||||||
@Excel(name = "柜")
|
|
||||||
private String containerNoName;
|
|
||||||
|
|
||||||
@ApiModelProperty("出仓日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date outboundDate;
|
|
||||||
@ApiModelProperty("完成时间")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date completeTime;
|
|
||||||
@ApiModelProperty("orderDate")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date orderDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输方式")
|
|
||||||
@Excel(name = "运输方式")
|
|
||||||
private String transportModeCode;
|
|
||||||
@ApiModelProperty("运输方式")
|
|
||||||
@Excel(name = "运输方式")
|
|
||||||
private String transportModeName;
|
|
||||||
@ApiModelProperty("监管方式")
|
|
||||||
@Excel(name = "监管方式")
|
|
||||||
private String supervisionModeCode;
|
|
||||||
@ApiModelProperty("监管方式")
|
|
||||||
@Excel(name = "监管方式")
|
|
||||||
private String supervisionModeName;
|
|
||||||
@ApiModelProperty("海关是否查验货物")
|
|
||||||
@Excel(name = "海关是否查验货物")
|
|
||||||
private String customsInspectionFlag;
|
|
||||||
@ApiModelProperty("是否需要报关")
|
|
||||||
@Excel(name = "是否需要报关")
|
|
||||||
private String needDeclareFlag;
|
|
||||||
@ApiModelProperty("是否需要运输")
|
|
||||||
@Excel(name = "是否需要运输")
|
|
||||||
private String needTransportFlag;
|
|
||||||
@ApiModelProperty("app上传的图片")
|
|
||||||
private String pictureApp;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务单号")
|
|
||||||
@Excel(name = "业务单号")
|
|
||||||
private String businessOrderNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务类型")
|
|
||||||
@Excel(name = "业务类型")
|
|
||||||
private String businessType;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人")
|
|
||||||
@Excel(name = "制单人")
|
|
||||||
private String documentCreator;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人名称")
|
|
||||||
@Excel(name = "制单人名称")
|
|
||||||
private String documentCreatorName;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单日期")
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date documentDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("结算币种")
|
|
||||||
private String settlementCurrency;
|
|
||||||
@ApiModelProperty("业务员ID")
|
|
||||||
private String salesmanId;
|
|
||||||
@ApiModelProperty("业务员名称")
|
|
||||||
private String salesmanName;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -34,45 +34,6 @@ public class SysDictType extends BaseEntity
|
|||||||
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
|
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
/** 组织表ID */
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
/** 组织名称 */
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
/** 一级组织表ID */
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
public Long getOrganizationId()
|
|
||||||
{
|
|
||||||
return organizationId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOrganizationId(Long organizationId)
|
|
||||||
{
|
|
||||||
this.organizationId = organizationId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getOrganizationName()
|
|
||||||
{
|
|
||||||
return organizationName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOrganizationName(String organizationName)
|
|
||||||
{
|
|
||||||
this.organizationName = organizationName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getTopOrganizationId()
|
|
||||||
{
|
|
||||||
return topOrganizationId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTopOrganizationId(Long topOrganizationId)
|
|
||||||
{
|
|
||||||
this.topOrganizationId = topOrganizationId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getDictId()
|
public Long getDictId()
|
||||||
{
|
{
|
||||||
return dictId;
|
return dictId;
|
||||||
@@ -125,9 +86,6 @@ public class SysDictType extends BaseEntity
|
|||||||
.append("dictName", getDictName())
|
.append("dictName", getDictName())
|
||||||
.append("dictType", getDictType())
|
.append("dictType", getDictType())
|
||||||
.append("status", getStatus())
|
.append("status", getStatus())
|
||||||
.append("organizationId", getOrganizationId())
|
|
||||||
.append("organizationName", getOrganizationName())
|
|
||||||
.append("topOrganizationId", getTopOrganizationId())
|
|
||||||
.append("createBy", getCreateBy())
|
.append("createBy", getCreateBy())
|
||||||
.append("createTime", getCreateTime())
|
.append("createTime", getCreateTime())
|
||||||
.append("updateBy", getUpdateBy())
|
.append("updateBy", getUpdateBy())
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ public class SysLogininfor {
|
|||||||
/**
|
/**
|
||||||
* 访问时间
|
* 访问时间
|
||||||
*/
|
*/
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
@Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date accessTime;
|
private Date accessTime;
|
||||||
|
|
||||||
@@ -109,4 +109,4 @@ public class SysLogininfor {
|
|||||||
* 响应时间ms
|
* 响应时间ms
|
||||||
*/
|
*/
|
||||||
private String responseTime;
|
private String responseTime;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ public class SysOperLog {
|
|||||||
/**
|
/**
|
||||||
* 操作时间
|
* 操作时间
|
||||||
*/
|
*/
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date operTime;
|
private Date operTime;
|
||||||
|
|
||||||
@@ -176,4 +176,4 @@ public class SysOperLog {
|
|||||||
* 端口
|
* 端口
|
||||||
*/
|
*/
|
||||||
private String port;
|
private String port;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-9
@@ -127,12 +127,4 @@ public class TmsMakeOutInvoice implements Serializable {
|
|||||||
private String actualInvoiceCustomerId;
|
private String actualInvoiceCustomerId;
|
||||||
@ApiModelProperty(value = "实际开票客户名称")
|
@ApiModelProperty(value = "实际开票客户名称")
|
||||||
private String actualInvoiceCustomerName;
|
private String actualInvoiceCustomerName;
|
||||||
@ApiModelProperty(value = "无税费用")
|
}
|
||||||
private BigDecimal taxFreeFee;
|
|
||||||
@ApiModelProperty(value = "税额")
|
|
||||||
private BigDecimal taxAmount;
|
|
||||||
@ApiModelProperty(value = "税率")
|
|
||||||
private Double taxRate;
|
|
||||||
@ApiModelProperty(value = "费用类别")
|
|
||||||
private String feeType;
|
|
||||||
}
|
|
||||||
|
|||||||
-77
@@ -1,77 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description: 销项发票表
|
|
||||||
* @Author: lfs
|
|
||||||
* @Date: 2020-02-19 08:50:47
|
|
||||||
* @Version: V1.0
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@TableName("tms_make_out_invoice_item")
|
|
||||||
public class TmsMakeOutInvoiceItem implements Serializable {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
/**主键*/
|
|
||||||
@TableId(type = IdType.ID_WORKER_STR)
|
|
||||||
private String id;
|
|
||||||
/**makeId*/
|
|
||||||
@ApiModelProperty(value = "makeId")
|
|
||||||
private String makeId;
|
|
||||||
/**发票金额*/
|
|
||||||
@ApiModelProperty(value = "发票金额")
|
|
||||||
private BigDecimal invoiceValue;
|
|
||||||
/**发票备注*/
|
|
||||||
@ApiModelProperty(value = "发票备注")
|
|
||||||
@Excel(name = "发票备注", width = 15)
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
/**创建人*/
|
|
||||||
@ApiModelProperty(value = "创建人")
|
|
||||||
private String createBy;
|
|
||||||
/**创建日期*/
|
|
||||||
@ApiModelProperty(value = "创建日期")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date createTime;
|
|
||||||
/**更新人*/
|
|
||||||
@ApiModelProperty(value = "更新人")
|
|
||||||
private String updateBy;
|
|
||||||
/**更新日期*/
|
|
||||||
@ApiModelProperty(value = "更新日期")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date updateTime;
|
|
||||||
/**是否删除（0-否，1-是）*/
|
|
||||||
@ApiModelProperty(value = "是否删除（0-否，1-是）")
|
|
||||||
private Integer isDelete;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "开票项目")
|
|
||||||
private String invoiceItem;
|
|
||||||
@ApiModelProperty(value = "开票项目名称")
|
|
||||||
private String invoiceItemName;
|
|
||||||
@ApiModelProperty(value = "实际开票客户id")
|
|
||||||
private String actualInvoiceCustomerId;
|
|
||||||
@ApiModelProperty(value = "实际开票客户名称")
|
|
||||||
private String actualInvoiceCustomerName;
|
|
||||||
@ApiModelProperty(value = "无税费用")
|
|
||||||
private BigDecimal taxFreeFee;
|
|
||||||
@ApiModelProperty(value = "税额")
|
|
||||||
private BigDecimal taxAmount;
|
|
||||||
@ApiModelProperty(value = "税率")
|
|
||||||
private Double taxRate;
|
|
||||||
@ApiModelProperty(value = "费用类别")
|
|
||||||
private String feeType;
|
|
||||||
}
|
|
||||||
@@ -1,510 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.domain.dto.wlhy.TmsAddressMultiDTO;
|
|
||||||
import com.mhd.common.core.domain.dto.wlhy.TmsCargoInfoDTO;
|
|
||||||
import com.mhd.common.core.domain.dto.wlhy.TmsOrderAccount;
|
|
||||||
import com.mhd.system.api.model.LoginUser;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description: 货源表
|
|
||||||
* @Author: lfs
|
|
||||||
* @Date: 2020-02-14 09:49:27
|
|
||||||
* @Version: V1.0
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class
|
|
||||||
|
|
||||||
TmsOrderAddDTO implements Serializable {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
@TableId(type = IdType.ID_WORKER_STR)
|
|
||||||
private String id;
|
|
||||||
// @ApiModelProperty(value = "线路名称ID")
|
|
||||||
// private java.lang.String lineNameId="";
|
|
||||||
// @ApiModelProperty(value = "线路名称")
|
|
||||||
// private java.lang.String lineName="";
|
|
||||||
//
|
|
||||||
// @ApiModelProperty(value = "运距（千米）")
|
|
||||||
// private BigDecimal haulDistance;
|
|
||||||
@ApiModelProperty(value = "装货地县区编码",required = true)
|
|
||||||
private String loadingAreaId="";
|
|
||||||
@ApiModelProperty(value = "装货地详细地址")
|
|
||||||
private String loadingAddress="";
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "发货人姓名")
|
|
||||||
private String freighterName="";
|
|
||||||
@ApiModelProperty(value = "装货电话")
|
|
||||||
private String loadingPhone="";
|
|
||||||
@ApiModelProperty(value = "装货时间日期（年月日）",required = true)
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
|
||||||
private java.util.Date loadingDate;
|
|
||||||
// @ApiModelProperty(value = "装货时间（上午、下午、24小时）")
|
|
||||||
// private String loadingTime="";
|
|
||||||
@ApiModelProperty(value = "卸货地县区编码",required = true)
|
|
||||||
private String unloadAreaId="";
|
|
||||||
@ApiModelProperty(value = "卸货地详细地址")
|
|
||||||
private String unloadAddress="";
|
|
||||||
@ApiModelProperty(value = "收货人姓名")
|
|
||||||
private String dischargerName="";
|
|
||||||
@ApiModelProperty(value = "卸货电话")
|
|
||||||
private String unloadPhone="";
|
|
||||||
@ApiModelProperty(value = "卸货时间日期（年月日）",required = true)
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
|
||||||
private java.util.Date unloadingData;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "装货时间id",required = true)
|
|
||||||
// private String loadingTimeId;
|
|
||||||
// @ApiModelProperty(value = "卸货时间id",required = true)
|
|
||||||
// private String unloadingTimeId;
|
|
||||||
// @ApiModelProperty(value = "卸货时间（上午、下午、24小时）")
|
|
||||||
// private java.lang.String unloadingTime;
|
|
||||||
@ApiModelProperty(value = "货物名称ID")
|
|
||||||
private String goodsNameId;
|
|
||||||
@ApiModelProperty(value = "货物名称")
|
|
||||||
private String goodsName;
|
|
||||||
@ApiModelProperty(value = "货物名称ID",required = true)
|
|
||||||
private String goodsTypeId;
|
|
||||||
@ApiModelProperty(value = "货物大类型")
|
|
||||||
private String goodsType="";
|
|
||||||
@ApiModelProperty(value = "重量小（吨）",required = true)
|
|
||||||
private BigDecimal weightMin;
|
|
||||||
@ApiModelProperty(value = "重量大（吨）",required = true)
|
|
||||||
private BigDecimal weightMax;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "货物数量单位（吨/方/件）id",required = true)
|
|
||||||
private String goodsUntisId;
|
|
||||||
@ApiModelProperty(value = "配载方式ID（0-数量，1-车次）",required = true)
|
|
||||||
private Integer transportationModeId = 1;
|
|
||||||
@ApiModelProperty(value = "车型车长ID")
|
|
||||||
private String carType;
|
|
||||||
// @ApiModelProperty(value = "指定司机ID")
|
|
||||||
// private String appointDriverId;
|
|
||||||
// @ApiModelProperty(value = "司机姓名")
|
|
||||||
// private String appointDriver;
|
|
||||||
// @ApiModelProperty(value = "司机手机号")
|
|
||||||
// private String appointDriverPhone;
|
|
||||||
// @ApiModelProperty(value = "司机车牌号")
|
|
||||||
// private String appointDriverLicense;
|
|
||||||
@ApiModelProperty(value = "服务要求ID")
|
|
||||||
private String serviceRequireId;
|
|
||||||
@ApiModelProperty(value = "备注")
|
|
||||||
private String remarks;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "备注")
|
|
||||||
private String orderRemark;
|
|
||||||
// @ApiModelProperty(value = "运单类型（0-企业普货、1-企业批量货、2-撮合货（普通货源）、3-客服运单，4-线下运单）")
|
|
||||||
// private Integer waybillType ;
|
|
||||||
@ApiModelProperty(value = "运单类型:0-pc端发货，1-pc端导入，2-货主端app发货")
|
|
||||||
private Integer waybillFrom = 2 ;
|
|
||||||
// @ApiModelProperty(value = "期望运费")
|
|
||||||
// private java.math.BigDecimal freightHope;
|
|
||||||
// @ApiModelProperty(value = "占用车长")
|
|
||||||
// private String occupyConductor;
|
|
||||||
@ApiModelProperty(value = "运单模式(0-普通模式,1-竞价模式)")
|
|
||||||
private Integer waybillMode = 0;
|
|
||||||
@ApiModelProperty(value = "竞价截止时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private java.util.Date latestBiddingTime;
|
|
||||||
@ApiModelProperty(value = "发货运费")
|
|
||||||
private BigDecimal deliveryFreight;
|
|
||||||
@ApiModelProperty(value = "运费单价（元/吨）")
|
|
||||||
private BigDecimal transportationUnitPrice;
|
|
||||||
@ApiModelProperty(value = "结算方式，1-按趟结算，2-按数量结算")
|
|
||||||
private Integer radioValue;
|
|
||||||
@ApiModelProperty(value = "合同物流导入(0-默认，1-合同,2-普通导入)")
|
|
||||||
private Integer isContract = 0;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "是否长期货源：0-否，1-是")
|
|
||||||
// private Integer isLongOrder=0;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "卸货单位")
|
|
||||||
// private java.lang.String unloadUnit;
|
|
||||||
// @ApiModelProperty(value = "收货人身份证号")
|
|
||||||
// private String unloadIdentificationNumber;
|
|
||||||
// @ApiModelProperty(value = "代运营人员用户ID")
|
|
||||||
// private String orderAgentUserId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "指定货主编号")
|
|
||||||
private String appointShipperId;
|
|
||||||
@ApiModelProperty(value = "指定货主")
|
|
||||||
private String appointShipper;
|
|
||||||
// @ApiModelProperty(value = "指定平台公司")
|
|
||||||
// private String appointCompanyId;
|
|
||||||
// @ApiModelProperty(value = "指定平台公司名称")
|
|
||||||
// private String appointCompanyName;
|
|
||||||
// @ApiModelProperty(value = "指定车辆ID")
|
|
||||||
// private String appointVehicleId;
|
|
||||||
// @ApiModelProperty(value = "指定车辆设备号")
|
|
||||||
// private String appointVehicleDevice;
|
|
||||||
|
|
||||||
|
|
||||||
/**是否开启路耗（0-否 1-是）*/
|
|
||||||
// @ApiModelProperty(value = "是否开启路耗（0-否 1-是）")
|
|
||||||
// @Excel(name = "是否开启路耗（0-否 1-是）", width = 15)
|
|
||||||
// private Integer isRoadLoss=0;
|
|
||||||
/**货物价值(元/吨)*/
|
|
||||||
// @ApiModelProperty(value = "货物价值(元/吨)")
|
|
||||||
// @Excel(name = "货物价值(元/吨)", width = 15)
|
|
||||||
// private BigDecimal goodsValue=BigDecimal.ZERO;
|
|
||||||
/**路耗模式（ 0-按比例% 1-按数量(吨)）*/
|
|
||||||
// @ApiModelProperty(value = "路耗模式（ 0-按比例% 1-按数量(吨)）")
|
|
||||||
// @Excel(name = "路耗模式（ 0-按比例% 1-按数量(吨)）", width = 15)
|
|
||||||
// private Integer roadLossMode;
|
|
||||||
// /**路耗结算方式( 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)*/
|
|
||||||
// @ApiModelProperty(value = "路耗结算方式(0-无 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)")
|
|
||||||
// @Excel(name = "路耗结算方式( 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)", width = 15)
|
|
||||||
// private Integer roadLossSettlementMethod;
|
|
||||||
/**允许货物亏损*/
|
|
||||||
// @ApiModelProperty(value = "允许货物亏损(吨或%)")
|
|
||||||
// @Excel(name = "允许货物亏损(吨或%)", width = 15)
|
|
||||||
// private BigDecimal allowableLoss=BigDecimal.ZERO;
|
|
||||||
|
|
||||||
/**超出亏损扣除金额（元/吨)*/
|
|
||||||
// @ApiModelProperty(value = "超出亏损扣除金额（元/吨)")
|
|
||||||
// @Excel(name = "超出亏损扣除金额（元/吨)", width = 15)
|
|
||||||
// private BigDecimal lossDeductionAmount=BigDecimal.ZERO;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "上游客户id")
|
|
||||||
// @Excel(name = "上游客户id", width = 15)
|
|
||||||
// private String upClientId;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "运费抹零 0-不抹零 ，1-抹零小数位，2-抹零个位，3-抹零十位")
|
|
||||||
// private Integer isFreightNullification ;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "加油宝计算模式 0-按比例 1-按数值")
|
|
||||||
private Integer oilValue ;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "是否允许接多单：0否 1是")
|
|
||||||
// private Integer isMultipleOrdersAllowed;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "发货备注")
|
|
||||||
private String shippingNote;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "涨吨是否计算费用 0-否 1-是 ")
|
|
||||||
// private Integer isTonnageIncreaseCharge;
|
|
||||||
@ApiModelProperty(value = "装货地经度")
|
|
||||||
private String loadingLongitude;
|
|
||||||
@ApiModelProperty(value = "装货地纬度")
|
|
||||||
private String loadingLatitude;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "卸货地经度")
|
|
||||||
private String unloadLongitude;
|
|
||||||
@ApiModelProperty(value = "卸货地纬度")
|
|
||||||
private String unloadLatitude;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "预设竞标价")
|
|
||||||
@Excel(name = "预设竞标价", width = 15)
|
|
||||||
private BigDecimal highestPrice;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "预设竞标价")
|
|
||||||
private BigDecimal presetPrice;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "竞价单位（元/车，元/吨）")
|
|
||||||
private String biddingUnit;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "竞价最高可输入价格")
|
|
||||||
@Excel(name = "竞价最高可输入价格", width = 15)
|
|
||||||
private BigDecimal maximumBidPrice;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "评标类型(0-自动评标,1-手动评标)")
|
|
||||||
private Integer bidEvaluationType = 1;
|
|
||||||
|
|
||||||
@ApiModelProperty("应收结算类型：1-月结，2-现结")
|
|
||||||
private Integer receivableType;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "货物数量")
|
|
||||||
private String goodsQuantity;
|
|
||||||
@ApiModelProperty(value = "货物数量单位code")
|
|
||||||
private String goodsQuantityUnitId;
|
|
||||||
@ApiModelProperty(value = "货物数量单位")
|
|
||||||
private String goodsQuantityUnit;
|
|
||||||
|
|
||||||
@ApiModelProperty("收款账户")
|
|
||||||
private String accountName;
|
|
||||||
@ApiModelProperty("收款账户信息")
|
|
||||||
private String accountInformation;
|
|
||||||
|
|
||||||
// @ApiModelProperty("项目表ID")
|
|
||||||
// private Long projectManagementId;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "服务费率")
|
|
||||||
// private BigDecimal serviceRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否自动生成协议 0-否 1-是")
|
|
||||||
@Excel(name = "是否自动生成协议 0-否 1-是")
|
|
||||||
private Integer isAutoGenerateProtocol;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "单车总费用")
|
|
||||||
// @Excel(name = "单车总费用", width = 15)
|
|
||||||
// private BigDecimal freightGross = BigDecimal.ZERO;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "协议费用：回单付金额")
|
|
||||||
// @Excel(name = "协议费用：回单付金额", width = 15)
|
|
||||||
// private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
|
|
||||||
//
|
|
||||||
// @ApiModelProperty(value = "协议费用：预付现金金额")
|
|
||||||
// @Excel(name = "协议费用：预付现金金额", width = 15)
|
|
||||||
// private BigDecimal cashAdvance = BigDecimal.ZERO;
|
|
||||||
//
|
|
||||||
// @ApiModelProperty(value = "协议费用：到付运费金额")
|
|
||||||
// @Excel(name = "协议费用：到付运费金额", width = 15)
|
|
||||||
// private BigDecimal freightAmount = BigDecimal.ZERO;
|
|
||||||
//
|
|
||||||
// @ApiModelProperty(value = "协议费用：预付平台油卡金额")
|
|
||||||
// @Excel(name = "协议费用：预付平台油卡金额", width = 15)
|
|
||||||
// private BigDecimal oilCardOnline = BigDecimal.ZERO;
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "单车重量", required = true)
|
|
||||||
// private BigDecimal singleVehicleWeight;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=================批量货派单相关=============================
|
|
||||||
// @ApiModelProperty(value = "需求车次")
|
|
||||||
// private Integer demandTrainNumber;
|
|
||||||
// @ApiModelProperty(value = "承运车次默认0")
|
|
||||||
// private Integer carriageNumber;
|
|
||||||
// @ApiModelProperty(value = "剩余需求车次")
|
|
||||||
// private Integer remainingDemandTrainNumber;
|
|
||||||
|
|
||||||
/**货物重量*/
|
|
||||||
// @ApiModelProperty(value = "货物重量")
|
|
||||||
// private BigDecimal goodsWeight;
|
|
||||||
// @ApiModelProperty(value = "货源剩余货物数量")
|
|
||||||
// private BigDecimal residueGoodsWeight;
|
|
||||||
// @ApiModelProperty(value = "承运货物数量")
|
|
||||||
// private BigDecimal transportGoodsWeight;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "货物信息表")
|
|
||||||
private List<TmsCargoInfoDTO> cargoInfoList;
|
|
||||||
@ApiModelProperty(value = "装货地址集合")
|
|
||||||
private List<TmsAddressMultiDTO> loadingAddressList;
|
|
||||||
@ApiModelProperty(value = "卸货地址集合")
|
|
||||||
private List<TmsAddressMultiDTO> unloadAddressList;
|
|
||||||
|
|
||||||
@ApiModelProperty("费用科目明细")
|
|
||||||
private List<TmsOrderAccount> tmsOrderAccountList;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// @ApiModelProperty(value = "来源系统")
|
|
||||||
// private String orderSource;
|
|
||||||
|
|
||||||
//========================================新增字段==========================================
|
|
||||||
@ApiModelProperty(value = "付款方类型（0-委托方，1-收货方）")
|
|
||||||
@Excel(name = "付款方类型（0-委托方，1-收货方）", width = 15)
|
|
||||||
private Integer payerType;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "收货方编码")
|
|
||||||
private String recipientId;
|
|
||||||
@ApiModelProperty(value = "收货方")
|
|
||||||
private String recipientName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "整机编号")
|
|
||||||
private String machineNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "是否库存（0-是，1-否）")
|
|
||||||
@Excel(name = "是否库存（0-是，1-否）", width = 15)
|
|
||||||
private Integer stockFlag;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "信息费")
|
|
||||||
private BigDecimal infoFee;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "订单类型（1-普货运输，2-危化运输，3-罐车运输，4-济南专线，5-江西专线）")
|
|
||||||
private Integer orderShippingType;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "单号")
|
|
||||||
private String thirdPartyOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "车辆类型Id")
|
|
||||||
private String vehicleTypeId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "车辆类型名称")
|
|
||||||
private String vehicleTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "承运人Id(订单为济南专线使用)")
|
|
||||||
private String carrier;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "承运人姓名(订单为济南专线使用)")
|
|
||||||
private String carrierName;
|
|
||||||
|
|
||||||
@ApiModelProperty("运费单价")
|
|
||||||
private BigDecimal freightUnitPrice;
|
|
||||||
|
|
||||||
@ApiModelProperty("数字物流平台用户id")
|
|
||||||
private Long szwlUserId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "信息费收款方")
|
|
||||||
private String infoFeePayee;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "信息费收款方方式（0-委托方，1-收货方，2-第三方）")
|
|
||||||
private Integer infoFeePayeeType;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务员ID")
|
|
||||||
private String salesmanId;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务员ID")
|
|
||||||
private String salesmanName;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否报关（0：否，1：是）")
|
|
||||||
private Integer isDeclare;
|
|
||||||
|
|
||||||
@ApiModelProperty("线路")
|
|
||||||
private String route;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜类型")
|
|
||||||
private String containerType;
|
|
||||||
|
|
||||||
@ApiModelProperty("柜类型名称")
|
|
||||||
private String containerTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("卡类型")
|
|
||||||
private String cardType;
|
|
||||||
|
|
||||||
@ApiModelProperty("卡类型名称")
|
|
||||||
private String cardTypeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("外来柜号")
|
|
||||||
private String externalContainerNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("中转地")
|
|
||||||
private String transitPlace;
|
|
||||||
|
|
||||||
@ApiModelProperty("托运人ID")
|
|
||||||
private String shipper;
|
|
||||||
|
|
||||||
@ApiModelProperty("托运人ID")
|
|
||||||
private String customsShipper;
|
|
||||||
|
|
||||||
@ApiModelProperty("托运人电话")
|
|
||||||
private String customsShipperTel;
|
|
||||||
|
|
||||||
@ApiModelProperty("卸货单位")
|
|
||||||
private String unloadingCompany;
|
|
||||||
|
|
||||||
@ApiModelProperty("合同编号")
|
|
||||||
private String contractNo;
|
|
||||||
|
|
||||||
@ApiModelProperty("运费")
|
|
||||||
private BigDecimal freightFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("卸货费")
|
|
||||||
private BigDecimal unloadingFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关费")
|
|
||||||
private BigDecimal customsFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("差货费")
|
|
||||||
private BigDecimal shortageFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("杂费")
|
|
||||||
private BigDecimal miscellaneousFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("其他费用")
|
|
||||||
private BigDecimal otherFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("滞车费")
|
|
||||||
private BigDecimal detentionFee;
|
|
||||||
|
|
||||||
@ApiModelProperty("税率")
|
|
||||||
private BigDecimal taxRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("结算币种")
|
|
||||||
private String settlementCurrency;
|
|
||||||
|
|
||||||
@ApiModelProperty("体积")
|
|
||||||
private BigDecimal volume;
|
|
||||||
|
|
||||||
@ApiModelProperty("内容详情")
|
|
||||||
private String detailContent;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关线路")
|
|
||||||
private String customsRoute;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关关口")
|
|
||||||
private String customsPort;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关联系人")
|
|
||||||
private String customsContact;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关联系人电话")
|
|
||||||
private String customsContactPhone;
|
|
||||||
|
|
||||||
@ApiModelProperty("报关备注")
|
|
||||||
private String customsRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "组织ID")
|
|
||||||
private String orgId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "所属组织")
|
|
||||||
@Excel(name = "所属组织", width = 15)
|
|
||||||
private String orgName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "组织ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "上级组织ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户编码nc")
|
|
||||||
private String customerCodeNc;
|
|
||||||
|
|
||||||
@ApiModelProperty("制单人编码nc")
|
|
||||||
private String makerCodeNc;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务员编码nc")
|
|
||||||
private String salesmanCodeNc;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "单据日期")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private java.util.Date documentDate;
|
|
||||||
|
|
||||||
@ApiModelProperty("收款账户id")
|
|
||||||
private String paymentAccountId;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("执行单id")
|
|
||||||
private String executeOrderId;
|
|
||||||
|
|
||||||
@ApiModelProperty("执行单号")
|
|
||||||
private String executeOrderNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单来源 0，oms 1，tms")
|
|
||||||
private String orderSource;
|
|
||||||
|
|
||||||
@ApiModelProperty("当前登录用户")
|
|
||||||
private LoginUser loginUser;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("发票编号")
|
|
||||||
@Excel(name = "发票编号")
|
|
||||||
private String invoiceNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单号")
|
|
||||||
@Excel(name = "订单号")
|
|
||||||
private String goodsNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty("业务主单")
|
|
||||||
@Excel(name = "业务主单")
|
|
||||||
private String businessMainOrder;
|
|
||||||
}
|
|
||||||
@@ -40,17 +40,4 @@ public class UserDTO extends BaseVOEntity {
|
|||||||
@ApiModelProperty(name = "用户角色")
|
@ApiModelProperty(name = "用户角色")
|
||||||
private String userRole;
|
private String userRole;
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("路线id")
|
|
||||||
private String lineManagementId;
|
|
||||||
|
|
||||||
@ApiModelProperty("路线编码")
|
|
||||||
private String routeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("路线名称")
|
|
||||||
private String routeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("配送顺序")
|
|
||||||
private String deliveryOrder;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
-293
@@ -1,293 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class UserShipperEntityFeign extends BaseVOEntity {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
@ApiModelProperty(name = "用户主表ID")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "用户主表ID")
|
|
||||||
private Long userId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "上级货主表ID")
|
|
||||||
private Long parentShipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "货主类型：0-无状态，1-个人，2-企业，3-个体工商户，4-企业员工")
|
|
||||||
private Integer shipperType;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "货主类别：1-普通客户 2-月结客户")
|
|
||||||
private Integer shipperCategory;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业名称")
|
|
||||||
private String shipperEnterpriseName;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业统一社会信用代码")
|
|
||||||
private String shipperEnterpriseSocialCreditCode;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业注册电话")
|
|
||||||
private String shipperEnterprisePhone;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业注册地址")
|
|
||||||
private String shipperEnterpriseAddress;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "企业营业期限起")
|
|
||||||
private Date shipperEnterpriseLicenseDateFrom;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "企业营业期限止")
|
|
||||||
private Date shipperEnterpriseLicenseDateTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "纳税人资质")
|
|
||||||
private String shipperEnterpriseTaxpayer;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业营业执照是否长期：0-无状态，1-是，2-否")
|
|
||||||
private Integer shipperEnterpriseLicenseLong;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "营业执照照片")
|
|
||||||
private String shipperEnterpriseLicenseFrontUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "是否法人：0-无状态，1-是，2-否")
|
|
||||||
private Integer shipperCorp;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 法人姓名
|
|
||||||
*/
|
|
||||||
@ApiModelProperty(name = "法人姓名")
|
|
||||||
private String shipperCorpName;
|
|
||||||
|
|
||||||
/** 企业法人姓名 */
|
|
||||||
@ApiModelProperty("企业法人姓名")
|
|
||||||
@Excel(name = "企业法人姓名")
|
|
||||||
private String shipperCorpLegalName;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证号")
|
|
||||||
private String shipperCorpIdcardNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证号加密")
|
|
||||||
private String shipperCorpIdcardNumberDes;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "法人身份证有效期自")
|
|
||||||
private Date shipperCorpIdcardDateFrom;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "法人身份证有效期止")
|
|
||||||
private Date shipperCorpIdcardDateTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否")
|
|
||||||
private Integer shipperCorpIdcardLong;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证正面照片")
|
|
||||||
private String shipperCorpIdcardFrontUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证反面照片")
|
|
||||||
private String shipperCorpIdcardBackUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证手持照片")
|
|
||||||
private String shipperCorpIdcardInhandUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "托运人个体货主认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效")
|
|
||||||
private Integer shipperFill;
|
|
||||||
@ApiModelProperty(name = "托运人个人认证时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date shipperFillTime;
|
|
||||||
@ApiModelProperty(name = "托运人个体货主审核人员id")
|
|
||||||
private Long shipperFillAuthId;
|
|
||||||
@ApiModelProperty(name = "托运人个体货主审核人员")
|
|
||||||
private String shipperFillAuthName;
|
|
||||||
@ApiModelProperty(name = "托运人个体货主审核原因")
|
|
||||||
private String shipperFillRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "托运人发货企业认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效")
|
|
||||||
private Integer shipperEnterpriseFill;
|
|
||||||
@ApiModelProperty(name = "托运人发货企业认证时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date shipperEnterpriseFillTime;
|
|
||||||
@ApiModelProperty(name = "托运人发货企业审核人员id")
|
|
||||||
private Long shipperEnterpriselAuthId;
|
|
||||||
@ApiModelProperty(name = "托运人发货企业审核人员")
|
|
||||||
private String shipperEnterpriselAuthName;
|
|
||||||
@ApiModelProperty(name = "托运人发货企业审核原因")
|
|
||||||
private String shipperEnterpriseFillRemark;
|
|
||||||
@ApiModelProperty(name = "纳税人识别号")
|
|
||||||
private String taxpayerNumber;
|
|
||||||
@ApiModelProperty(name = "托运人发货企业审核原因")
|
|
||||||
private String taxpayerQualification;
|
|
||||||
@ApiModelProperty(name = "营业执照过期日期")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date businessLicenseDate;
|
|
||||||
@ApiModelProperty(value = "所在地区省市县名称")
|
|
||||||
private String area;
|
|
||||||
@ApiModelProperty(name = "所在地区县区编码")
|
|
||||||
private String areaId;
|
|
||||||
@ApiModelProperty(name = "详细地址")
|
|
||||||
private String detailAddress;
|
|
||||||
@ApiModelProperty(name = "行业")
|
|
||||||
private String trade;
|
|
||||||
@ApiModelProperty(name = "经营范围")
|
|
||||||
private String businessScope;
|
|
||||||
@ApiModelProperty(name = "营业期限")
|
|
||||||
private String businessTerm;
|
|
||||||
@ApiModelProperty(name = "注册地址")
|
|
||||||
private String regAddress;
|
|
||||||
@ApiModelProperty(name = "注册资本")
|
|
||||||
private String capital;
|
|
||||||
@ApiModelProperty(name = "成立日期")
|
|
||||||
private String establishDate;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "账号标识，创建后账号在e签宝平台中的唯一标识（认证授权ID-保留最新）")
|
|
||||||
private String companyAccountId ;
|
|
||||||
@ApiModelProperty(name = "用户电子签章（机构认证授权长连接）")
|
|
||||||
private String companyTemplateSeal;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "月结标识 1-是 2-否")
|
|
||||||
private Integer monthlySettlementFlag;
|
|
||||||
@ApiModelProperty(name = "货源单自动审核（1-是 2-否）")
|
|
||||||
private Integer isAutoAuditOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "回单原件标记（1-需要，2-不需要）")
|
|
||||||
private Integer originalReceiptFlag;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "运费节点（0-无要求，1-确认回单，2-纸质回单）")
|
|
||||||
private Integer freightNode;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "e签宝授权认证状态（0-未授权，1-授权中，2-授权完成，3-授权失败）")
|
|
||||||
private Integer esignAuthStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "e签宝跨企业授权状态（0-未授权，1-授权中，2-授权完成，3-授权失败）")
|
|
||||||
private Integer esignEnterpriseStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "e签宝跨企业授权业务流程编号")
|
|
||||||
private String esignSealAuthId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "授权额度")
|
|
||||||
private BigDecimal authorizedQuota;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "结算天数")
|
|
||||||
private Integer settlementDay;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "已使用额度")
|
|
||||||
private BigDecimal authorizedUsedAmount;
|
|
||||||
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "数据来源：1-接口同步 2-人工新增")
|
|
||||||
private Integer dataSource;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "客户nc编码")
|
|
||||||
private String customerNcCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("结算币种")
|
|
||||||
private String settlementCurrency;
|
|
||||||
|
|
||||||
@ApiModelProperty("职务/角色权限字符，控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)")
|
|
||||||
private String roleCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主/供应商/客户编码")
|
|
||||||
private String userMemberCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主/供应商/客户名称")
|
|
||||||
private String userNameShipper;
|
|
||||||
|
|
||||||
@ApiModelProperty("联系人")
|
|
||||||
private String emergencyContactName;
|
|
||||||
|
|
||||||
@ApiModelProperty("联系电话")
|
|
||||||
private String emergencyContactPhone;
|
|
||||||
|
|
||||||
@ApiModelProperty("省市区编码，6位")
|
|
||||||
private Long userAreaCountyId;
|
|
||||||
|
|
||||||
@ApiModelProperty("省事区名称")
|
|
||||||
private String userAreaName;
|
|
||||||
|
|
||||||
@ApiModelProperty("详细地址")
|
|
||||||
private String userAreaAddress;
|
|
||||||
|
|
||||||
@ApiModelProperty("法人代表")
|
|
||||||
private String legalRepresentative;
|
|
||||||
|
|
||||||
@ApiModelProperty("统一编码")
|
|
||||||
private String unifiedCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("注册电话")
|
|
||||||
private String registeredPhone;
|
|
||||||
|
|
||||||
@ApiModelProperty("注册地址")
|
|
||||||
private String registeredAddress;
|
|
||||||
|
|
||||||
@ApiModelProperty("传真")
|
|
||||||
private String fax;
|
|
||||||
|
|
||||||
@ApiModelProperty("付款银行")
|
|
||||||
private String paymentBank;
|
|
||||||
|
|
||||||
@ApiModelProperty("付款账户")
|
|
||||||
private String paymentAccount;
|
|
||||||
|
|
||||||
@ApiModelProperty("发票抬头")
|
|
||||||
private String invoiceTitle;
|
|
||||||
|
|
||||||
@ApiModelProperty("税号")
|
|
||||||
private String taxNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "邮箱")
|
|
||||||
private String userEmail;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "备注")
|
|
||||||
private String userRemark;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "一级组织表ID")
|
|
||||||
private Long topOrganizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "组织表ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "推送状态 1-未推送 2-推送中 3-推送成功 4-推送失败")
|
|
||||||
private Integer pushStatus;
|
|
||||||
@ApiModelProperty(name = "推送时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date pushTime;
|
|
||||||
@ApiModelProperty(name = "推送人")
|
|
||||||
private Long pushBy;
|
|
||||||
@ApiModelProperty(name = "推送人姓名")
|
|
||||||
private String pushByName;
|
|
||||||
@ApiModelProperty(name = "额度同步时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date limitTime;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "信用余额")
|
|
||||||
private BigDecimal creditAmount;
|
|
||||||
|
|
||||||
@ApiModelProperty("协议数量")
|
|
||||||
private Integer agreementCount;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "是否校验信用")
|
|
||||||
private String isCheckCredit;
|
|
||||||
|
|
||||||
}
|
|
||||||
-270
@@ -1,270 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.annotation.fieldsetvalue.NeedSetValue;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class UserShipperFeignDTO extends UserDTO {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "角色表ID集合")
|
|
||||||
private List<Long> roleIds;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "货主表ID")
|
|
||||||
private Long shipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "用户主表ID")
|
|
||||||
private Long userId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "上级货主表ID")
|
|
||||||
private Long parentShipperId;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "货主类型：0-无状态，1-个人，2-企业")
|
|
||||||
private Integer shipperType;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "货主类别：1-普通客户 2-月结客户")
|
|
||||||
private Integer shipperCategory;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业名称")
|
|
||||||
private String shipperEnterpriseName;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业统一社会信用代码")
|
|
||||||
private String shipperEnterpriseSocialCreditCode;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业注册电话")
|
|
||||||
private String shipperEnterprisePhone;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业注册地址")
|
|
||||||
private String shipperEnterpriseAddress;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "企业营业期限起")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
private Date shipperEnterpriseLicenseDateFrom;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "企业营业期限止")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
private Date shipperEnterpriseLicenseDateTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业营业执照是否长期：0-无状态，1-是，2-否")
|
|
||||||
private Integer shipperEnterpriseLicenseLong;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "纳税人资质")
|
|
||||||
private String shipperEnterpriseTaxpayer;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "营业执照照片")
|
|
||||||
@NeedSetValue
|
|
||||||
private String shipperEnterpriseLicenseFrontUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "是否法人：0-无状态，1-是，2-否")
|
|
||||||
private Integer shipperCorp;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 法人姓名
|
|
||||||
*/
|
|
||||||
@ApiModelProperty(name = "法人姓名")
|
|
||||||
private String shipperCorpName;
|
|
||||||
/** 企业法人姓名 */
|
|
||||||
@ApiModelProperty("企业法人姓名")
|
|
||||||
@Excel(name = "企业法人姓名")
|
|
||||||
private String shipperCorpLegalName;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证号")
|
|
||||||
private String shipperCorpIdcardNumber;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证号加密")
|
|
||||||
private String shipperCorpIdcardNumberDes;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "法人身份证有效期自")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
private Date shipperCorpIdcardDateFrom;
|
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
|
||||||
@ApiModelProperty(name = "法人身份证有效期止")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
private Date shipperCorpIdcardDateTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证是否长期：0-无状态，1-是，2-否")
|
|
||||||
private Integer shipperCorpIdcardLong;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证正面照片")
|
|
||||||
@NeedSetValue
|
|
||||||
private String shipperCorpIdcardFrontUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证反面照片")
|
|
||||||
@NeedSetValue
|
|
||||||
private String shipperCorpIdcardBackUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "法人身份证手持照片")
|
|
||||||
@NeedSetValue
|
|
||||||
private String shipperCorpIdcardInhandUrl;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "货主审核状态：0-无状态，1-未认证，2-待审核，3-已通过，4-已驳回")
|
|
||||||
private Integer shipperAuthStatus;
|
|
||||||
@ApiModelProperty(name = "货主审核人用户姓名")
|
|
||||||
private String shipperAuthByUsername;
|
|
||||||
@ApiModelProperty(name = "货主审核时间")
|
|
||||||
private Date shipperAuthTime;
|
|
||||||
@ApiModelProperty(name = "货主审核原因")
|
|
||||||
private String shipperStatusRemark;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date createTimeFrom;
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
|
||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date createTimeTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "审核角色：1-个人托运人，2-企业托运人")
|
|
||||||
private Integer authType;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "新增托运人步骤（1-用户注册，2-提交认证资料，3-认证结果）")
|
|
||||||
private Integer stepFlag;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "纳税人识别号")
|
|
||||||
private String taxpayerNumber;
|
|
||||||
@ApiModelProperty(name = "托运人发货企业审核原因")
|
|
||||||
private String taxpayerQualification;
|
|
||||||
@ApiModelProperty(name = "营业执照过期日期")
|
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date businessLicenseDate;
|
|
||||||
@ApiModelProperty(value = "所在地区省市县名称")
|
|
||||||
private String area;
|
|
||||||
@ApiModelProperty(name = "所在地区县区编码")
|
|
||||||
private String areaId;
|
|
||||||
@ApiModelProperty(name = "详细地址")
|
|
||||||
private String detailAddress;
|
|
||||||
@ApiModelProperty(name = "行业")
|
|
||||||
private String trade;
|
|
||||||
@ApiModelProperty(name = "经营范围")
|
|
||||||
private String businessScope;
|
|
||||||
@ApiModelProperty(name = "营业期限")
|
|
||||||
private String businessTerm;
|
|
||||||
@ApiModelProperty(name = "注册地址")
|
|
||||||
private String regAddress;
|
|
||||||
@ApiModelProperty(name = "注册资本")
|
|
||||||
private String capital;
|
|
||||||
@ApiModelProperty(name = "成立日期")
|
|
||||||
private String establishDate;
|
|
||||||
@ApiModelProperty(name = "账号标识，创建后账号在e签宝平台中的唯一标识")
|
|
||||||
private String companyAccountId ;
|
|
||||||
@ApiModelProperty(name = "用户电子签章")
|
|
||||||
private String companyTemplateSeal;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "月结标识 1-是 2-否")
|
|
||||||
private Integer monthlySettlementFlag;
|
|
||||||
@ApiModelProperty(name = "总授信额度")
|
|
||||||
private BigDecimal totalLimit;
|
|
||||||
@ApiModelProperty(name = "货源单自动审核（1-是 2-否）")
|
|
||||||
private Integer isAutoAuditOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "托运人个体货主认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效")
|
|
||||||
private Integer shipperFill;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "托运人发货企业认证状态：0-无状态，1-未认证，2-正在审核，3-认证通过，4-认证失败，5-认证失效")
|
|
||||||
private Integer shipperEnterpriseFill;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "回单原件标记（1-需要，2-不需要）")
|
|
||||||
private Integer originalReceiptFlag;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "运费节点（0-无要求，1-确认回单，2-纸质回单）")
|
|
||||||
private Integer freightNode;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "用户主表ID集合")
|
|
||||||
private List<Long> userIdList;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "备注信息")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "数据来源：1-接口同步 2-人工新增")
|
|
||||||
private Integer dataSource;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户nc编码")
|
|
||||||
private String customerNcCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户nc编码列表")
|
|
||||||
private List<UserShipperEntityFeign> customerNcCodeList;
|
|
||||||
|
|
||||||
@ApiModelProperty("组织ID")
|
|
||||||
private Long organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty("结算币种")
|
|
||||||
private String settlementCurrency;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("货主/供应商/客户编码")
|
|
||||||
private String userMemberCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("货主/供应商/客户名称")
|
|
||||||
private String userNameShipper;
|
|
||||||
|
|
||||||
@ApiModelProperty("法人代表")
|
|
||||||
private String legalRepresentative;
|
|
||||||
|
|
||||||
@ApiModelProperty("统一编码")
|
|
||||||
private String unifiedCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("注册电话")
|
|
||||||
private String registeredPhone;
|
|
||||||
|
|
||||||
@ApiModelProperty("注册地址")
|
|
||||||
private String registeredAddress;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "邮箱")
|
|
||||||
private String userEmail;
|
|
||||||
|
|
||||||
@ApiModelProperty("传真")
|
|
||||||
private String fax;
|
|
||||||
|
|
||||||
@ApiModelProperty("付款银行")
|
|
||||||
private String paymentBank;
|
|
||||||
|
|
||||||
@ApiModelProperty("付款账户")
|
|
||||||
private String paymentAccount;
|
|
||||||
|
|
||||||
@ApiModelProperty("发票抬头")
|
|
||||||
private String invoiceTitle;
|
|
||||||
|
|
||||||
@ApiModelProperty("税号")
|
|
||||||
private String taxNumber;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "更新时间起")
|
|
||||||
private String updateTimeFrom;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "更新时间止")
|
|
||||||
private String updateTimeTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送时间起")
|
|
||||||
private String pushTimeFrom;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送时间止")
|
|
||||||
private String pushTimeTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送状态")
|
|
||||||
private Integer pushStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "登录账号（2-20位）")
|
|
||||||
private String userAccount;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "登录密码（6-20位）")
|
|
||||||
private String userPassword;
|
|
||||||
@ApiModelProperty(name = "是否校验信用")
|
|
||||||
private String isCheckCredit;
|
|
||||||
}
|
|
||||||
-52
@@ -1,52 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class UserShipperQueryDTO {
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码")
|
|
||||||
private Integer pageNum = 1;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "每页数量")
|
|
||||||
private Integer pageSize = 10;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "登录账号")
|
|
||||||
private String userAccount;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "企业名称")
|
|
||||||
private String shipperEnterpriseName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "组织ID")
|
|
||||||
private String organizationId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "组织名称")
|
|
||||||
private String organizationName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间起")
|
|
||||||
private String createTimeFrom;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间止")
|
|
||||||
private String createTimeTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "更新时间起")
|
|
||||||
private String updateTimeFrom;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "更新时间止")
|
|
||||||
private String updateTimeTo;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "货主类型")
|
|
||||||
private String shipperType;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送状态")
|
|
||||||
private Integer pushStatus;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送时间起")
|
|
||||||
private String pushTimeFrom;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送时间止")
|
|
||||||
private String pushTimeTo;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -42,10 +42,10 @@ public class UserUpdateDTO extends BaseVOEntity {
|
|||||||
private String userIdcardNumber;
|
private String userIdcardNumber;
|
||||||
@ApiModelProperty(name = "身份证号加密")
|
@ApiModelProperty(name = "身份证号加密")
|
||||||
private String userIdcardNumberDes;
|
private String userIdcardNumberDes;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "身份证有效期自")
|
@ApiModelProperty(name = "身份证有效期自")
|
||||||
private Date userIdcardDateFrom;
|
private Date userIdcardDateFrom;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "身份证有效期至")
|
@ApiModelProperty(name = "身份证有效期至")
|
||||||
private Date userIdcardDateTo;
|
private Date userIdcardDateTo;
|
||||||
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
|
@ApiModelProperty(name = "身份证是否长期：0-无状态，1-是，2-否")
|
||||||
@@ -76,7 +76,7 @@ public class UserUpdateDTO extends BaseVOEntity {
|
|||||||
private String userWechatSessionKey;
|
private String userWechatSessionKey;
|
||||||
@ApiModelProperty(name = "密码登录错误次数")
|
@ApiModelProperty(name = "密码登录错误次数")
|
||||||
private Integer passwordWrongTimes;
|
private Integer passwordWrongTimes;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@ApiModelProperty(name = "最近一次登录时间")
|
@ApiModelProperty(name = "最近一次登录时间")
|
||||||
private Date lastLoginTime;
|
private Date lastLoginTime;
|
||||||
@ApiModelProperty(name = "最近一次登录IP")
|
@ApiModelProperty(name = "最近一次登录IP")
|
||||||
@@ -89,15 +89,15 @@ public class UserUpdateDTO extends BaseVOEntity {
|
|||||||
private int userAuthStatus;
|
private int userAuthStatus;
|
||||||
@ApiModelProperty(name = "用户审核人用户姓名")
|
@ApiModelProperty(name = "用户审核人用户姓名")
|
||||||
private String userAuthByUsername;
|
private String userAuthByUsername;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "用户审核时间")
|
@ApiModelProperty(name = "用户审核时间")
|
||||||
private Date userAuthTime;
|
private Date userAuthTime;
|
||||||
@ApiModelProperty(name = "加入黑名单备注（解除时需要清空）")
|
@ApiModelProperty(name = "加入黑名单备注（解除时需要清空）")
|
||||||
private String userStatusRemark;
|
private String userStatusRemark;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "用户状态更新时间")
|
@ApiModelProperty(name = "用户状态更新时间")
|
||||||
private Date userStatusTime;
|
private Date userStatusTime;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "用户生日")
|
@ApiModelProperty(name = "用户生日")
|
||||||
private Date userBirthday;
|
private Date userBirthday;
|
||||||
@ApiModelProperty(name = "用户住址信息")
|
@ApiModelProperty(name = "用户住址信息")
|
||||||
@@ -122,4 +122,4 @@ public class UserUpdateDTO extends BaseVOEntity {
|
|||||||
@ApiModelProperty(name = "请求域名")
|
@ApiModelProperty(name = "请求域名")
|
||||||
private String tenantsDomainName;
|
private String tenantsDomainName;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
package com.mhd.system.api.domain;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* YMS登录用户信息
|
|
||||||
* @author AI
|
|
||||||
* @date 2026/05/13
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class YmsLoginUser {
|
|
||||||
|
|
||||||
//登录人id
|
|
||||||
private Long id;
|
|
||||||
//登录人账号
|
|
||||||
private String username;
|
|
||||||
//登录人名字
|
|
||||||
private String nickName;
|
|
||||||
//登录人密码
|
|
||||||
private String password;
|
|
||||||
//当前登录部门code
|
|
||||||
private String orgCode;
|
|
||||||
//头像
|
|
||||||
private String avatar;
|
|
||||||
//性别（0男 1女 2未知）
|
|
||||||
private String sex;
|
|
||||||
//电子邮件
|
|
||||||
private String email;
|
|
||||||
//电话
|
|
||||||
private String phonenumber;
|
|
||||||
//状态(0正常 1停用）
|
|
||||||
private String status;
|
|
||||||
//删除标志（0代表存在 2代表删除）
|
|
||||||
private String delFlag;
|
|
||||||
//最后登录IP
|
|
||||||
private String loginIp;
|
|
||||||
//最后登录时间
|
|
||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date loginDate;
|
|
||||||
//创建时间
|
|
||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
private Date createTime;
|
|
||||||
//数字物流用户ID
|
|
||||||
private Long szwlUserId;
|
|
||||||
//一级组织表ID
|
|
||||||
private Long topOrganizationId;
|
|
||||||
//组织表ID
|
|
||||||
private Long organizationId;
|
|
||||||
//角色code集合
|
|
||||||
private String roleCodes;
|
|
||||||
//角色名称集合
|
|
||||||
private String roleNames;
|
|
||||||
//推广码
|
|
||||||
private String promoCode;
|
|
||||||
//账号类型 1.普通账号，2.组织账号，3.一级账号，4.平台员工，5.企业员工，6.合作商
|
|
||||||
private Integer userAccountType;
|
|
||||||
}
|
|
||||||
-15
@@ -42,11 +42,6 @@ public class RemoteBmsFeignFallbackFactory implements FallbackFactory<BmsService
|
|||||||
return AjaxResult.error(throwable.getMessage());
|
return AjaxResult.error(throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getCustomersInfoBySettlementEntityId(Long settlementEntityId, Long topOrganizationId) {
|
|
||||||
return AjaxResult.error(throwable.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult pushSyncData(BusinessDataPushDTO businessDataPushDTO) {
|
public AjaxResult pushSyncData(BusinessDataPushDTO businessDataPushDTO) {
|
||||||
return AjaxResult.error(throwable.getMessage());
|
return AjaxResult.error(throwable.getMessage());
|
||||||
@@ -56,16 +51,6 @@ public class RemoteBmsFeignFallbackFactory implements FallbackFactory<BmsService
|
|||||||
public AjaxResult getDocumentInfoByCodeSet(Set<String> documentTypeCodeSet) {
|
public AjaxResult getDocumentInfoByCodeSet(Set<String> documentTypeCodeSet) {
|
||||||
return AjaxResult.error(throwable.getMessage());
|
return AjaxResult.error(throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult businessDocumentApiSave(BusinessDataPushDTO businessDataPushDTO) {
|
|
||||||
return AjaxResult.error(throwable.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult wholeRentSynchronizationZXF(BusinessDataPushDTO businessDataPushDTO) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-95
@@ -1,95 +0,0 @@
|
|||||||
package com.mhd.system.api.factory;
|
|
||||||
|
|
||||||
import com.mhd.common.core.domain.dto.BusinessDataPushDTO;
|
|
||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
|
||||||
import com.mhd.system.api.BmsServiceFeign;
|
|
||||||
import com.mhd.system.api.OmsServiceFeign;
|
|
||||||
import com.mhd.system.api.domain.*;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description
|
|
||||||
* @Author zg
|
|
||||||
* @Version 1.0
|
|
||||||
* @Date 2023/11/3 14:37
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsServiceFeign> {
|
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(RemoteOmsFeignFallbackFactory.class);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OmsServiceFeign create(Throwable throwable) {
|
|
||||||
log.error("系统服务调用失败:{}", throwable.getMessage());
|
|
||||||
return new OmsServiceFeign() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult pushInOrder(StockInOrderTZPD stockInOrder) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult pushInOrderDetail(InMaterialDetailTZPD inMaterialDetail) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult pushOutOrder(StockOutOrderTZPD stockOutOrder) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult pushOutOrderDetail(OutMaterialDetailTZPD outMaterialDetail) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> omsEdit(MaterialInventoryOmsParamDO materialInventoryOmsParamDO) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
// public AjaxResult inventoryAdjustmentRecordInsert(InventoryAdjustmentRecord inventoryAdjustmentRecord) {
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getCountryList(ErpCountryDTO erpCountryDTO) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult insertGwLog(GwLogDTO gwLogDTO) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult updateGwLog(GwLogDTO gwLogDTO) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult batchPush(List<Long> idList) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult batchPushByNumber(List<String> numberList) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-45
@@ -154,11 +154,6 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
|
|||||||
return AjaxResult.error("根据批次ID获取批次信息失败");
|
return AjaxResult.error("根据批次ID获取批次信息失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getBatchListByName(String batchName, Long organizationId) {
|
|
||||||
return AjaxResult.error("根据批次名称查询批次列表失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getBatchDetailListByBatchId(Long batchId) {
|
public AjaxResult getBatchDetailListByBatchId(Long batchId) {
|
||||||
return AjaxResult.error("根据batchId获取对应批次详情信息失败");
|
return AjaxResult.error("根据batchId获取对应批次详情信息失败");
|
||||||
@@ -174,11 +169,6 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
|
|||||||
return AjaxResult.error("获取用户当前设置的仓库失败");
|
return AjaxResult.error("获取用户当前设置的仓库失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getWarehouseInfoFromDb(Long correlationId) {
|
|
||||||
return AjaxResult.error("从数据库获取用户当前设置的仓库失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getWarehouseInfoByWarehouseId(@PathVariable("warehouseId") Long warehouseId) {
|
public AjaxResult getWarehouseInfoByWarehouseId(@PathVariable("warehouseId") Long warehouseId) {
|
||||||
return AjaxResult.error("根据仓库ID获取仓库信息失败");
|
return AjaxResult.error("根据仓库ID获取仓库信息失败");
|
||||||
@@ -204,11 +194,6 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
|
|||||||
return AjaxResult.error("根据包装ID和单位编码获取信息失败");
|
return AjaxResult.error("根据包装ID和单位编码获取信息失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getPackList(String packCode, String packName, Long organizationId) {
|
|
||||||
return AjaxResult.error("根据包装编码/名称查询包装列表失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getPlatformInfoByPlatformId(Long platformId) {
|
public AjaxResult getPlatformInfoByPlatformId(Long platformId) {
|
||||||
return AjaxResult.error("根据platformId获取对应月台信息失败");
|
return AjaxResult.error("根据platformId获取对应月台信息失败");
|
||||||
@@ -244,11 +229,6 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
|
|||||||
return AjaxResult.error("获取科目信息失败" + throwable.getMessage());
|
return AjaxResult.error("获取科目信息失败" + throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getSubInfoByCode2(String subjectCode, Long topOrganizationId) {
|
|
||||||
return AjaxResult.error("获取科目信息失败" + throwable.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getProjectByCode(String projectCode) {
|
public AjaxResult getProjectByCode(String projectCode) {
|
||||||
return AjaxResult.error("获取项目信息失败" + throwable.getMessage());
|
return AjaxResult.error("获取项目信息失败" + throwable.getMessage());
|
||||||
@@ -274,40 +254,15 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
|
|||||||
return AjaxResult.error("查询失败");
|
return AjaxResult.error("查询失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getGeneralContract() {
|
|
||||||
return AjaxResult.error("查询失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getInfoByCustomer(String settlementCustomersCode, Integer contractType) {
|
public AjaxResult getInfoByCustomer(String settlementCustomersCode, Integer contractType) {
|
||||||
return AjaxResult.error("查询失败");
|
return AjaxResult.error("查询失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getInfoByCustomer2(String settlementCustomersCode, Integer contractType, Long topOrganizationId) {
|
|
||||||
return AjaxResult.error("查询失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getInfoByCustomerAndOrganizationId(String settlementCustomersCode, Integer contractType, Long topOrganizationId, Long organizationId) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult queryList() {
|
public AjaxResult queryList() {
|
||||||
return AjaxResult.error("查询失败");
|
return AjaxResult.error("查询失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult wholeRentSynchronization() {
|
|
||||||
return AjaxResult.error("查询失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult matchForMaterialImport(String keyword, Long organizationId) {
|
|
||||||
return AjaxResult.error("物料分类匹配失败");
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-36
@@ -5,11 +5,8 @@ import com.mhd.common.core.domain.dto.StatisticalMattersDTO;
|
|||||||
import com.mhd.common.core.domain.dto.UserDataPermissionQueryDTO;
|
import com.mhd.common.core.domain.dto.UserDataPermissionQueryDTO;
|
||||||
import com.mhd.common.core.domain.dto.UserDriverDTO;
|
import com.mhd.common.core.domain.dto.UserDriverDTO;
|
||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
import com.mhd.common.core.web.domain.AjaxResult;
|
||||||
import com.mhd.common.core.web.page.TableDataInfo;
|
|
||||||
import com.mhd.system.api.UserServiceFeign;
|
import com.mhd.system.api.UserServiceFeign;
|
||||||
import com.mhd.system.api.domain.UserDTO;
|
import com.mhd.system.api.domain.UserDTO;
|
||||||
import com.mhd.system.api.domain.UserShipperFeignDTO;
|
|
||||||
import com.mhd.system.api.domain.UserShipperQueryDTO;
|
|
||||||
import com.mhd.system.api.domain.UserUpdateDTO;
|
import com.mhd.system.api.domain.UserUpdateDTO;
|
||||||
import com.mhd.system.api.model.LoginUser;
|
import com.mhd.system.api.model.LoginUser;
|
||||||
import com.mhd.common.core.domain.entity.R;
|
import com.mhd.common.core.domain.entity.R;
|
||||||
@@ -22,8 +19,6 @@ import org.springframework.web.bind.annotation.PathVariable;
|
|||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -186,37 +181,6 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
|
|||||||
public AjaxResult<?> getShipperByUserId(Long userId) {
|
public AjaxResult<?> getShipperByUserId(Long userId) {
|
||||||
return AjaxResult.error("查询失败" + throwable.getMessage());
|
return AjaxResult.error("查询失败" + throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult updateLineManagement(UserDTO userDTO) {
|
|
||||||
return AjaxResult.error("失败" + throwable.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TableDataInfo userShipperList(UserShipperQueryDTO userShipperQueryDTO) {
|
|
||||||
TableDataInfo tableDataInfo = new TableDataInfo();
|
|
||||||
tableDataInfo.setData(new ArrayList<>());
|
|
||||||
tableDataInfo.setTotal(0);
|
|
||||||
tableDataInfo.setCode(500);
|
|
||||||
tableDataInfo.setMsg("查询失败:" + throwable.getMessage());
|
|
||||||
return tableDataInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult<?> updatePushStatus(Long shipperId, Integer pushStatus, String pushTime, Long pushBy, String pushByName, Long organizationId) {
|
|
||||||
return AjaxResult.error("更新失败" + throwable.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult getCustomerNcCodeBatch(List<Long> shipperIdList) {
|
|
||||||
return AjaxResult.error("更新失败" + throwable.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult querySaleCreditLimitFeign(UserShipperFeignDTO userShipperDTO) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-28
@@ -16,7 +16,6 @@ import com.mhd.common.core.utils.sms.Result;
|
|||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
import com.mhd.common.core.web.domain.AjaxResult;
|
||||||
import com.mhd.system.api.WlhyServiceFeign;
|
import com.mhd.system.api.WlhyServiceFeign;
|
||||||
import com.mhd.system.api.domain.*;
|
import com.mhd.system.api.domain.*;
|
||||||
import com.mhd.system.api.domain.TmsOrderAddDTO;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||||
@@ -520,22 +519,6 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public R<List<TmsMakeOutInvoice>> selectMakeOutInvoiceListByReconciliation(ReconciliationDTO reconciliationDTO) {
|
|
||||||
R<List<TmsMakeOutInvoice>> res = new R<>();
|
|
||||||
res.setMsg("查询失败"+cause.getMessage());
|
|
||||||
res.setCode(R.FAIL);
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public R<List<TmsMakeOutInvoiceItem>> selectMakeOutInvoiceItemList(TmsMakeOutInvoice tmsMakeOutInvoice) {
|
|
||||||
R<List<TmsMakeOutInvoiceItem>> res = new R<>();
|
|
||||||
res.setMsg("查询失败"+cause.getMessage());
|
|
||||||
res.setCode(R.FAIL);
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Result<?> queryById(String id) {
|
public Result<?> queryById(String id) {
|
||||||
return null;
|
return null;
|
||||||
@@ -550,16 +533,6 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
|
|||||||
public AjaxResult cancelIssueDocuments(String executeOrderId) {
|
public AjaxResult cancelIssueDocuments(String executeOrderId) {
|
||||||
return AjaxResult.error(cause.getMessage());
|
return AjaxResult.error(cause.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult<?> queryList(Integer pageNo, Integer pageSize, String pushStatus, String organizationId) {
|
|
||||||
return AjaxResult.error(cause.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName, String organization) {
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-40
@@ -2,18 +2,17 @@ package com.mhd.system.api.factory;
|
|||||||
|
|
||||||
import com.mhd.common.core.domain.entity.R;
|
import com.mhd.common.core.domain.entity.R;
|
||||||
import com.mhd.common.core.web.domain.AjaxResult;
|
import com.mhd.common.core.web.domain.AjaxResult;
|
||||||
import com.mhd.common.core.web.page.TableDataInfo;
|
|
||||||
import com.mhd.system.api.WlhyServiceFeign;
|
import com.mhd.system.api.WlhyServiceFeign;
|
||||||
import com.mhd.system.api.WmsServiceFeign;
|
import com.mhd.system.api.WmsServiceFeign;
|
||||||
import com.mhd.system.api.domain.*;
|
import com.mhd.system.api.domain.MaterialBaseInfoFeign;
|
||||||
|
import com.mhd.system.api.domain.MaterialInventoryDTO;
|
||||||
|
import com.mhd.system.api.domain.NoticeOrderDTO;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -55,41 +54,6 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
|
|||||||
public AjaxResult materialInventoryApiListAll(MaterialInventoryDTO materialInventoryDTO) {
|
public AjaxResult materialInventoryApiListAll(MaterialInventoryDTO materialInventoryDTO) {
|
||||||
return AjaxResult.error(cause.getMessage());
|
return AjaxResult.error(cause.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void omsOutOrderAdd(StockOutOrder stockOutOrder) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void omsOutOrderAddDetail(List<OutMaterialDetail> outMaterialDetails) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void omsOutOrderAddDeliveryDetailsLink(List<DeliveryDetailsLink> deliveryDetailsLinks) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void omsInOrderAdd(StockInOrder stockInOrder) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void omsInOrderAddDetail(List<InMaterialDetail> inMaterialDetails) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO) {
|
|
||||||
TableDataInfo tableDataInfo = new TableDataInfo();
|
|
||||||
tableDataInfo.setData(new ArrayList<>());
|
|
||||||
tableDataInfo.setTotal(0);
|
|
||||||
tableDataInfo.setCode(500);
|
|
||||||
return tableDataInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AjaxResult<?> updateMaterialPushStatus(Long materialBaseInfoId, Integer pushStatus, String pushTime, Long pushBy, String pushByName) {
|
|
||||||
return AjaxResult.error(cause.getMessage());
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import com.mhd.system.api.domain.MallOAuthToken;
|
|||||||
import com.mhd.system.api.domain.mall.BaseUser;
|
import com.mhd.system.api.domain.mall.BaseUser;
|
||||||
import com.mhd.system.api.domain.SysUser;
|
import com.mhd.system.api.domain.SysUser;
|
||||||
import com.mhd.system.api.domain.WlhyLoginUser;
|
import com.mhd.system.api.domain.WlhyLoginUser;
|
||||||
import com.mhd.system.api.domain.YmsLoginUser;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -88,11 +87,6 @@ public class LoginUser implements Serializable
|
|||||||
*/
|
*/
|
||||||
private WlhyLoginUser wlhyLoginUser;
|
private WlhyLoginUser wlhyLoginUser;
|
||||||
|
|
||||||
/**
|
|
||||||
* YMS用户信息
|
|
||||||
*/
|
|
||||||
private YmsLoginUser ymsLoginUser;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* websocket地址
|
* websocket地址
|
||||||
*/
|
*/
|
||||||
@@ -168,16 +162,4 @@ public class LoginUser implements Serializable
|
|||||||
@ApiModelProperty("仓库信息")
|
@ApiModelProperty("仓库信息")
|
||||||
private WarehousePO warehousePO;
|
private WarehousePO warehousePO;
|
||||||
|
|
||||||
@ApiModelProperty("路线id")
|
|
||||||
private String lineManagementId;
|
|
||||||
|
|
||||||
@ApiModelProperty("路线编码")
|
|
||||||
private String routeCode;
|
|
||||||
|
|
||||||
@ApiModelProperty("路线名称")
|
|
||||||
private String routeName;
|
|
||||||
|
|
||||||
@ApiModelProperty("配送顺序")
|
|
||||||
private String deliveryOrder;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import com.mhd.common.log.service.AsyncLogService;
|
|||||||
import com.mhd.common.redis.service.RedisService;
|
import com.mhd.common.redis.service.RedisService;
|
||||||
import com.mhd.system.api.*;
|
import com.mhd.system.api.*;
|
||||||
import com.mhd.system.api.domain.*;
|
import com.mhd.system.api.domain.*;
|
||||||
import com.mhd.system.api.domain.YmsLoginUser;
|
|
||||||
import com.mhd.system.api.domain.mall.SysTenant;
|
import com.mhd.system.api.domain.mall.SysTenant;
|
||||||
import com.mhd.system.api.domain.mall.UserInfo;
|
import com.mhd.system.api.domain.mall.UserInfo;
|
||||||
import com.mhd.system.api.domain.mall.UserInfoLoginDTO;
|
import com.mhd.system.api.domain.mall.UserInfoLoginDTO;
|
||||||
@@ -71,8 +70,6 @@ public class SysLoginService {
|
|||||||
private UserServiceFeign userServiceFeign;
|
private UserServiceFeign userServiceFeign;
|
||||||
@Resource
|
@Resource
|
||||||
private WlhyServiceFeign wlhyServiceFeign;
|
private WlhyServiceFeign wlhyServiceFeign;
|
||||||
@Resource
|
|
||||||
private YmsServiceFeign ymsServiceFeign;
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private RedisService redisService;
|
private RedisService redisService;
|
||||||
@@ -462,17 +459,6 @@ public class SysLoginService {
|
|||||||
userInfo.setWlhyLoginUser(wlhyLoginUserR.getData());
|
userInfo.setWlhyLoginUser(wlhyLoginUserR.getData());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 获取YMS登录用户基本信息
|
|
||||||
try {
|
|
||||||
R<YmsLoginUser> ymsLoginUserR = ymsServiceFeign.getYmsUserInfo(userInfo.getUserPo().getUserId());
|
|
||||||
if (ymsLoginUserR.getCode() == R.SUCCESS && ymsLoginUserR.getData() != null) {
|
|
||||||
userInfo.setYmsLoginUser(ymsLoginUserR.getData());
|
|
||||||
log.info("获取YMS用户信息成功，userId: {}", userInfo.getUserPo().getUserId());
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
// 获取YMS用户信息失败时，记录日志但不影响登录
|
|
||||||
log.warn("获取YMS用户信息失败，但不影响登录: {}", e.getMessage());
|
|
||||||
}
|
|
||||||
if(mallFlag == 1){
|
if(mallFlag == 1){
|
||||||
/*单点登录，获取商城鉴权
|
/*单点登录，获取商城鉴权
|
||||||
* 根据用户角色判断需要鉴权的服务，
|
* 根据用户角色判断需要鉴权的服务，
|
||||||
|
|||||||
@@ -12,26 +12,18 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
# server-addr: 127.0.0.1:8848
|
|
||||||
# 线上测试环境配置 容器名+端口号
|
|
||||||
server-addr: 10.33.0.129:6010
|
|
||||||
# username: nacos
|
|
||||||
# password: manhuoda@2023
|
|
||||||
#线上正式环境
|
#线上正式环境
|
||||||
# server-addr: 10.102.192.5:6848
|
server-addr: 10.102.192.5:6848
|
||||||
# username: nacos
|
username: nacos
|
||||||
# password: manhuoda@2023
|
password: manhuoda@2023
|
||||||
config:
|
config:
|
||||||
# server-addr: 127.0.0.1:8848
|
|
||||||
# 测试环境配置 容器名+端口号
|
|
||||||
server-addr: 10.33.0.129:6010
|
|
||||||
# 线上测试环境配置 容器名+端口号
|
# 线上测试环境配置 容器名+端口号
|
||||||
# server-addr: 10.102.192.5:6848
|
server-addr: 10.102.192.5:6848
|
||||||
# username: nacos
|
username: nacos
|
||||||
# password: manhuoda@2023
|
password: manhuoda@2023
|
||||||
#线上正式环境
|
#线上正式环境
|
||||||
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
|
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
|
||||||
file-extension: yml #默认properties
|
file-extension: yml #默认properties
|
||||||
# 共享配置
|
# 共享配置
|
||||||
shared-configs:
|
shared-configs:
|
||||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
# 基础镜像
|
|
||||||
FROM arm64v8/openjdk:8
|
|
||||||
# author
|
|
||||||
MAINTAINER manhuoda
|
|
||||||
#指定东八区时区
|
|
||||||
ENV TZ Asia/Shanghai
|
|
||||||
#指定utf-8编码格
|
|
||||||
ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
|
|
||||||
# VOLUME 指定了临时文件目录为/tmp。
|
|
||||||
# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp
|
|
||||||
VOLUME /tmp
|
|
||||||
#将当前jar 复制到容器根目录下
|
|
||||||
ADD target/mhd-bi.jar mhd-bi.jar
|
|
||||||
#暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
|
|
||||||
EXPOSE 9200
|
|
||||||
# 运行jar包
|
|
||||||
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd-bi.jar"]
|
|
||||||
-180
@@ -1,180 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>mhd</artifactId>
|
|
||||||
<groupId>com.mhd</groupId>
|
|
||||||
<version>3.6.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<artifactId>mhd-bi</artifactId>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.source>8</maven.compiler.source>
|
|
||||||
<maven.compiler.target>8</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!--添加web依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--添加feign依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.github.openfeign</groupId>
|
|
||||||
<artifactId>feign-httpclient</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-loadbalancer</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--nacos 服务注册客户端依赖-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- Sentinel⽀持采⽤ Nacos 作为规则配置数据源，引⼊该适配依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-datasource-nacos</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--sentinel 核⼼环境 依赖-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--链路追踪-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-sleuth</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- Jackson -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
|
||||||
<artifactId>jackson-databind</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Alibaba Fastjson -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.fastjson2</groupId>
|
|
||||||
<artifactId>fastjson2</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--spring cloud stream 依赖（rabbit）-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- Mhd Common Core-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mhd</groupId>
|
|
||||||
<artifactId>mhd-common-core</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- Mhd Common Redis-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mhd</groupId>
|
|
||||||
<artifactId>mhd-common-redis</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.dameng</groupId>
|
|
||||||
<artifactId>DmJdbcDriver18</artifactId>
|
|
||||||
<version>8.1.1.193</version>
|
|
||||||
</dependency>
|
|
||||||
<!--import mybatis plus 它会自动引入mybatis及mybatis spring切勿重复引用以免冲突-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-boot-starter</artifactId>
|
|
||||||
<version>3.3.2</version>
|
|
||||||
</dependency>
|
|
||||||
<!--添加druid连接池 依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>druid-spring-boot-starter</artifactId>
|
|
||||||
<version>1.2.11</version>
|
|
||||||
</dependency>
|
|
||||||
<!--链路追踪-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-sleuth</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-zipkin</artifactId>
|
|
||||||
<version>2.2.8.RELEASE</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Mhd Common Security-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mhd</groupId>
|
|
||||||
<artifactId>mhd-common-security</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mhd</groupId>
|
|
||||||
<artifactId>mhd-api-system</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mhd</groupId>
|
|
||||||
<artifactId>mhd-common-log</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- net.sf.json -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.json-lib</groupId>
|
|
||||||
<artifactId>json-lib</artifactId>
|
|
||||||
<version>2.4</version>
|
|
||||||
<classifier>jdk15</classifier>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mhd</groupId>
|
|
||||||
<artifactId>mhd-common-datasource</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<version>2.1.1.RELEASE</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>mhd-bi</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>com.spotify</groupId>
|
|
||||||
<artifactId>dockerfile-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
</project>
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
-- =============================================================================
|
|
||||||
-- 达梦 DM8：综合态势（单表，可重复执行）
|
|
||||||
-- 接口：GET /biReport/comprehensive
|
|
||||||
-- 执行顺序：删除历史多表/旧快照 → 建 BI_COMPREHENSIVE_SNAPSHOT → 示例 INSERT
|
|
||||||
-- PAYLOAD_JSON 与 ComprehensiveSituationVO 字段名一致；接口取 DEL_FLAG=1 且 CREATE_TIME 最新一条。
|
|
||||||
-- =============================================================================
|
|
||||||
|
|
||||||
-- 子表优先
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_COMPREHENSIVE_INCOME_TREND;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_COMPREHENSIVE_METRIC;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_COMPREHENSIVE_SNAPSHOT;
|
|
||||||
|
|
||||||
CREATE TABLE
|
|
||||||
BI_COMPREHENSIVE_SNAPSHOT (
|
|
||||||
ID BIGINT IDENTITY(1,1) NOT NULL,
|
|
||||||
PAYLOAD_JSON CLOB NOT NULL,
|
|
||||||
CREATE_TIME DATETIME DEFAULT NULL,
|
|
||||||
UPDATE_TIME DATETIME DEFAULT NULL,
|
|
||||||
REMARK VARCHAR(500) DEFAULT NULL,
|
|
||||||
DEL_FLAG NUMBER(1) DEFAULT 1 NOT NULL,
|
|
||||||
PRIMARY KEY (ID)
|
|
||||||
);
|
|
||||||
CREATE INDEX IDX_BI_COMP_SNAP_DEL_CR ON
|
|
||||||
BI_COMPREHENSIVE_SNAPSHOT(DEL_FLAG, CREATE_TIME);
|
|
||||||
CREATE INDEX IDX_BI_COMP_SNAP_UPD ON
|
|
||||||
BI_COMPREHENSIVE_SNAPSHOT(UPDATE_TIME);
|
|
||||||
COMMENT ON TABLE
|
|
||||||
BI_COMPREHENSIVE_SNAPSHOT IS '综合态势-整包 JSON 快照';
|
|
||||||
COMMENT ON COLUMN
|
|
||||||
BI_COMPREHENSIVE_SNAPSHOT.DEL_FLAG IS '0无状态 1正常 2已删除';
|
|
||||||
|
|
||||||
INSERT INTO
|
|
||||||
BI_COMPREHENSIVE_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG)
|
|
||||||
VALUES (
|
|
||||||
'{"valueAddedServiceIncome":5330000,"inventoryTurnover":25,"orderCount":42300,"vehicleUtilizationRate":97.4,"fuelConsumptionPerHundredKm":15,"incomeTrend":[280,210,260,310,470,390]}',
|
|
||||||
SYSDATE,
|
|
||||||
SYSDATE,
|
|
||||||
1
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
-- =============================================================================
|
|
||||||
-- 达梦 DM8：月台监测（单表，可重复执行）
|
|
||||||
-- 接口：GET /biReport/platformSurveillance
|
|
||||||
-- 执行顺序：删除历史多表/旧快照 → 建 BI_PLATFORM_SURVEILLANCE_SNAPSHOT → 示例 INSERT
|
|
||||||
-- PAYLOAD_JSON 与 PlatformSurveillanceVO 一致；接口取 DEL_FLAG=1 且 CREATE_TIME 最新一条。
|
|
||||||
-- =============================================================================
|
|
||||||
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PS_ALARM_DIST;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PS_TASK_TYPE;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PS_ALARM_TREND;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PS_TASK_LOAD;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PS_AVG_DURATION_TREND;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PS_VEHICLE;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PLATFORM_SURVEILLANCE_METRIC;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_PLATFORM_SURVEILLANCE_SNAPSHOT;
|
|
||||||
|
|
||||||
CREATE TABLE
|
|
||||||
BI_PLATFORM_SURVEILLANCE_SNAPSHOT (
|
|
||||||
ID BIGINT IDENTITY(1,1) NOT NULL,
|
|
||||||
PAYLOAD_JSON CLOB NOT NULL,
|
|
||||||
CREATE_TIME DATETIME DEFAULT NULL,
|
|
||||||
UPDATE_TIME DATETIME DEFAULT NULL,
|
|
||||||
REMARK VARCHAR(500) DEFAULT NULL,
|
|
||||||
DEL_FLAG NUMBER(1) DEFAULT 1 NOT NULL,
|
|
||||||
PRIMARY KEY (ID)
|
|
||||||
);
|
|
||||||
CREATE INDEX IDX_BI_PS_SNAP_DEL_CR ON
|
|
||||||
BI_PLATFORM_SURVEILLANCE_SNAPSHOT(DEL_FLAG, CREATE_TIME);
|
|
||||||
CREATE INDEX IDX_BI_PS_SNAP_UPD ON
|
|
||||||
BI_PLATFORM_SURVEILLANCE_SNAPSHOT(UPDATE_TIME);
|
|
||||||
COMMENT ON TABLE
|
|
||||||
BI_PLATFORM_SURVEILLANCE_SNAPSHOT IS '月台监测-整包 JSON 快照';
|
|
||||||
COMMENT ON COLUMN
|
|
||||||
BI_PLATFORM_SURVEILLANCE_SNAPSHOT.DEL_FLAG IS '0无状态 1正常 2已删除';
|
|
||||||
|
|
||||||
INSERT INTO
|
|
||||||
BI_PLATFORM_SURVEILLANCE_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG)
|
|
||||||
VALUES (
|
|
||||||
'{"vehicles":[{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"已离园","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265},{"plateNumber":"粤CFR1958","status":"作业中","platformId":"#48","platformDuration":265}],"efficiencyStatistics":{"entryOvertimeRate":60,"overtimeCount":45,"platformOnTimeRate":92,"avgPlatformDuration":4.5,"yardOnTimeRate":88,"avgYardDuration":4.5},"platformOverview":{"totalPlatforms":43,"currentOccupancyRate":50,"operatingPlatforms":23,"todayTasks":324},"vehicleStatus":{"todayReservedVehicles":3000,"notCheckedIn":1500,"operatingVehicles":1000,"completedVehicles":1000},"avgOperationDurationTrend":[{"month":"11月","yardDuration":10,"platformDuration":23},{"month":"12月","yardDuration":14,"platformDuration":15},{"month":"1月","yardDuration":23.5,"platformDuration":20},{"month":"2月","yardDuration":22,"platformDuration":17},{"month":"3月","yardDuration":13,"platformDuration":14},{"month":"4月","yardDuration":17,"platformDuration":10}],"monthlyTaskStatistics":{"taskTotal":1455,"taskTotalYoY":5,"avgTaskDuration":4.5,"avgDurationYoY":-5,"taskCompletionRate":95,"completionRateYoY":5},"taskLoadStatistics":[{"time":"15时","taskCount":100},{"time":"16时","taskCount":110},{"time":"17时","taskCount":115},{"time":"18时","taskCount":80},{"time":"19时","taskCount":60},{"time":"20时","taskCount":40},{"time":"21时","taskCount":40},{"time":"22时","taskCount":40},{"time":"23时","taskCount":30},{"time":"0时","taskCount":10},{"time":"1时","taskCount":10},{"time":"2时","taskCount":10},{"time":"3时","taskCount":10},{"time":"4时","taskCount":10},{"time":"5时","taskCount":10},{"time":"6时","taskCount":20},{"time":"7时","taskCount":30},{"time":"8时","taskCount":70},{"time":"9时","taskCount":95},{"time":"10时","taskCount":110},{"time":"11时","taskCount":120},{"time":"12时","taskCount":130},{"time":"13时","taskCount":130}],"platformAlarmTrend":[{"date":"11日","alarmCount":10},{"date":"12日","alarmCount":14},{"date":"13日","alarmCount":23},{"date":"14日","alarmCount":22},{"date":"15日","alarmCount":13},{"date":"16日","alarmCount":17},{"date":"17日","alarmCount":8}],"taskTypeStatistics":{"totalTasks":4325,"taskTypes":[{"type":"类型1","count":2400},{"type":"类型2","count":2300},{"type":"类型3","count":2300},{"type":"类型4","count":2300}]},"platformAlarmStatistics":{"todayAlarmTotal":13,"handled":12,"unhandled":1},"platformAlarmDistribution":[{"type":"类型1","count":300},{"type":"类型2","count":245},{"type":"类型3","count":280},{"type":"类型4","count":340},{"type":"类型5","count":455},{"type":"类型6","count":400},{"type":"类型7","count":300}]}',
|
|
||||||
SYSDATE,
|
|
||||||
SYSDATE,
|
|
||||||
1
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
-- =============================================================================
|
|
||||||
-- 达梦 DM8：仓储运输（单表，可重复执行）
|
|
||||||
-- 接口：GET /biReport/warehouseTransport
|
|
||||||
-- 执行顺序：删除历史多表/旧快照 → 建 BI_WAREHOUSE_TRANSPORT_SNAPSHOT → 示例 INSERT
|
|
||||||
-- PAYLOAD_JSON 与 WarehouseTransportSituationVO 字段名一致；接口取 DEL_FLAG=1 且 CREATE_TIME 最新一条。
|
|
||||||
-- =============================================================================
|
|
||||||
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_WTS_CUSTOMER_RANK;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_WTS_TIME_SERIES;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_WAREHOUSE_TRANSPORT_METRIC;
|
|
||||||
DROP TABLE IF EXISTS
|
|
||||||
BI_WAREHOUSE_TRANSPORT_SNAPSHOT;
|
|
||||||
|
|
||||||
CREATE TABLE
|
|
||||||
BI_WAREHOUSE_TRANSPORT_SNAPSHOT (
|
|
||||||
ID BIGINT IDENTITY(1,1) NOT NULL,
|
|
||||||
PAYLOAD_JSON CLOB NOT NULL,
|
|
||||||
CREATE_TIME DATETIME DEFAULT NULL,
|
|
||||||
UPDATE_TIME DATETIME DEFAULT NULL,
|
|
||||||
REMARK VARCHAR(500) DEFAULT NULL,
|
|
||||||
DEL_FLAG NUMBER(1) DEFAULT 1 NOT NULL,
|
|
||||||
PRIMARY KEY (ID)
|
|
||||||
);
|
|
||||||
CREATE INDEX IDX_BI_WTS_SNAP_DEL_CR ON
|
|
||||||
BI_WAREHOUSE_TRANSPORT_SNAPSHOT(DEL_FLAG, CREATE_TIME);
|
|
||||||
CREATE INDEX IDX_BI_WTS_SNAP_UPD ON
|
|
||||||
BI_WAREHOUSE_TRANSPORT_SNAPSHOT(UPDATE_TIME);
|
|
||||||
COMMENT ON TABLE
|
|
||||||
BI_WAREHOUSE_TRANSPORT_SNAPSHOT IS '仓储运输-整包 JSON 快照';
|
|
||||||
COMMENT ON COLUMN
|
|
||||||
BI_WAREHOUSE_TRANSPORT_SNAPSHOT.DEL_FLAG IS '0无状态 1正常 2已删除';
|
|
||||||
|
|
||||||
INSERT INTO
|
|
||||||
BI_WAREHOUSE_TRANSPORT_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG)
|
|
||||||
VALUES (
|
|
||||||
'{"warehouseDistributionOnTimeRate":99.2,"currentYearOrders":525440,"currentQuarterOrders":225120,"currentMonthOrders":23560,"warehouseOrderTrend":[100,93,85,70,98,88],"throughput":[10,14,23,10,13,19],"currentMonthTurnoverRate":3,"currentYearTurnoverRate":4,"inventoryTurnoverTrend":[10,14,23,22,13,17],"totalTransportIncome":5850,"orderCount":856,"transportTrips":533,"annualTransportVolume":15,"transportOrderTotal":4325,"crossBorderTransportOrder":2400,"domesticTransportOrder":2300,"transportTripsTrend":[100,140,230,100,130,192],"vehicleUtilizationRate":[600,460,350,470,450,620],"warehouseDockSyncRate":[100,98,87,78,97,86],"customerContributionRank":{"customerName":["客户A","客户B","客户C","客户D","客户E"],"customerAmount":[147,150,170,160,180]}}',
|
|
||||||
SYSDATE,
|
|
||||||
SYSDATE,
|
|
||||||
1
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
ALTER TABLE BI_COMPREHENSIVE_SNAPSHOT
|
|
||||||
ADD (DEL_FLAG TINYINT DEFAULT 1);
|
|
||||||
|
|
||||||
COMMENT ON COLUMN BI_COMPREHENSIVE_SNAPSHOT.DEL_FLAG IS '删除标志：0-无状态, 1-正常, 2-已删除';
|
|
||||||
|
|
||||||
ALTER TABLE BI_PLATFORM_SURVEILLANCE_SNAPSHOT
|
|
||||||
ADD (DEL_FLAG TINYINT DEFAULT 1);
|
|
||||||
|
|
||||||
COMMENT ON COLUMN BI_PLATFORM_SURVEILLANCE_SNAPSHOT.DEL_FLAG IS '删除标志：0-无状态, 1-正常, 2-已删除';
|
|
||||||
|
|
||||||
|
|
||||||
ALTER TABLE BI_WAREHOUSE_TRANSPORT_SNAPSHOT
|
|
||||||
ADD (DEL_FLAG TINYINT DEFAULT 1);
|
|
||||||
|
|
||||||
COMMENT ON COLUMN BI_WAREHOUSE_TRANSPORT_SNAPSHOT.DEL_FLAG IS '删除标志：0-无状态, 1-正常, 2-已删除';
|
|
||||||
@@ -1,236 +0,0 @@
|
|||||||
package com.mhd.bi;
|
|
||||||
|
|
||||||
import com.mhd.common.core.annotation.fieldsetvalue.CommonService;
|
|
||||||
import com.mhd.common.core.annotation.fieldsetvalue.SetFeildValueAspect;
|
|
||||||
import org.mybatis.spring.annotation.MapperScan;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
|
||||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
|
||||||
import org.springframework.context.annotation.Import;
|
|
||||||
import org.springframework.scheduling.annotation.EnableAsync;
|
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
||||||
|
|
||||||
@SpringBootApplication(scanBasePackages = {"com.mhd", "com.mhd.bi"})
|
|
||||||
@EnableDiscoveryClient
|
|
||||||
@EnableFeignClients(basePackages = {"com.mhd","com.mhd.bi.infrastructure.feign"})
|
|
||||||
@MapperScan("com.mhd.bi.domain.**.mapper")
|
|
||||||
@Import({SetFeildValueAspect.class, CommonService.class})
|
|
||||||
@EnableAsync
|
|
||||||
@EnableScheduling
|
|
||||||
public class BiApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(BiApplication.class, args);
|
|
||||||
System.out.println("(♥◠‿◠)ﾉﾞ 可视化页面模块启动成功 ლ(´ڡ`ლ)ﾞ " +
|
|
||||||
"# _oo0oo_\n" +
|
|
||||||
"# o8888888o\n" +
|
|
||||||
"# 88\" . \"88\n" +
|
|
||||||
"# (| -_- |)\n" +
|
|
||||||
"# 0\\ = /0\n" +
|
|
||||||
"# ___/`---'\\___\n" +
|
|
||||||
"# .' \\\\| |// '.\n" +
|
|
||||||
"# / \\\\||| : |||// \\\n" +
|
|
||||||
"# / _||||| -:- |||||- \\\n" +
|
|
||||||
"# | | \\\\\\ - /// | |\n" +
|
|
||||||
"# | \\_| ''\\---/'' |_/ |\n" +
|
|
||||||
"# \\ .-\\__ '-' ___/-. /\n" +
|
|
||||||
"# ___'. .' /--.--\\ `. .'___\n" +
|
|
||||||
"# .\"\" '< `.___\\_<|>_/___.' >' \"\".\n" +
|
|
||||||
"# | | : `- \\`.;`\\ _ /`;.`/ - ` : | |\n" +
|
|
||||||
"# \\ \\ `_. \\_ __\\ /__ _/ .-` / /\n" +
|
|
||||||
"# =====`-.____`.___ \\_____/___.-`___.-'=====\n" +
|
|
||||||
"# `=---='\n" +
|
|
||||||
"#\n" +
|
|
||||||
"#\n" +
|
|
||||||
"# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
|
|
||||||
"#\n" +
|
|
||||||
"# 佛祖保佑 永无BUG\n" +
|
|
||||||
"#\n" +
|
|
||||||
"# ┏┓ ┏┓\n" +
|
|
||||||
"# ┏┛┻━━━┛┻┓\n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┃ ━ ┃\n" +
|
|
||||||
"# ┃ ┳┛ ┗┳ ┃\n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┃ ┻ ┃\n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┗━┓ ┏━┛Codes are far away from bugs with the animal protecting\n" +
|
|
||||||
"# ┃ ┃ 神兽保佑,代码无bug\n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┃ ┗━━━┓\n" +
|
|
||||||
"# ┃ ┣┓\n" +
|
|
||||||
"# ┃ ┏┛\n" +
|
|
||||||
"# ┗┓┓┏━┳┓┏┛\n" +
|
|
||||||
"# ┃┫┫ ┃┫┫\n" +
|
|
||||||
"# ┗┻┛ ┗┻┛\n" +
|
|
||||||
"#\n" +
|
|
||||||
"# ┏┓ ┏┓\n" +
|
|
||||||
"# ┏┛┻━━━┛┻┓\n" +
|
|
||||||
"# ┃ ┃ \n" +
|
|
||||||
"# ┃ ━ ┃\n" +
|
|
||||||
"# ┃ ＞ ＜┃\n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┃ . ⌒ ..┃\n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┗━┓ ┏━┛\n" +
|
|
||||||
"# ┃ ┃ Codes are far away from bugs with the animal protecting \n" +
|
|
||||||
"# ┃ ┃ 神兽保佑,代码无bug\n" +
|
|
||||||
"# ┃ ┃ \n" +
|
|
||||||
"# ┃ ┃ \n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┃ ┃ \n" +
|
|
||||||
"# ┃ ┗━━━┓\n" +
|
|
||||||
"# ┃ ┣┓\n" +
|
|
||||||
"# ┃ ┏┛\n" +
|
|
||||||
"# ┗┓┓┏━┳┓┏┛\n" +
|
|
||||||
"# ┃┫┫ ┃┫┫\n" +
|
|
||||||
"# ┗┻┛ ┗┻┛\n" +
|
|
||||||
"# ┏┓ ┏┓+ +\n" +
|
|
||||||
"# ┏┛┻━━━┛┻┓ + +\n" +
|
|
||||||
"# ┃ ┃ \n" +
|
|
||||||
"# ┃ ━ ┃ ++ + + +\n" +
|
|
||||||
"# ████━████ ┃+\n" +
|
|
||||||
"# ┃ ┃ +\n" +
|
|
||||||
"# ┃ ┻ ┃\n" +
|
|
||||||
"# ┃ ┃ + +\n" +
|
|
||||||
"# ┗━┓ ┏━┛\n" +
|
|
||||||
"# ┃ ┃ \n" +
|
|
||||||
"# ┃ ┃ + + + +\n" +
|
|
||||||
"# ┃ ┃ Codes are far away from bugs with the animal protecting \n" +
|
|
||||||
"# ┃ ┃ + 神兽保佑,代码无bug \n" +
|
|
||||||
"# ┃ ┃\n" +
|
|
||||||
"# ┃ ┃ + \n" +
|
|
||||||
"# ┃ ┗━━━┓ + +\n" +
|
|
||||||
"# ┃ ┣┓\n" +
|
|
||||||
"# ┃ ┏┛\n" +
|
|
||||||
"# ┗┓┓┏━┳┓┏┛ + + + +\n" +
|
|
||||||
"# ┃┫┫ ┃┫┫\n" +
|
|
||||||
"# ┗┻┛ ┗┻┛+ + + +\n" +
|
|
||||||
"# d*##$.\n" +
|
|
||||||
"# zP\"\"\"\"\"$e. $\" $o\n" +
|
|
||||||
"#4$ '$ $\" $\n" +
|
|
||||||
"#'$ '$ J$ $F\n" +
|
|
||||||
"# 'b $k $> $\n" +
|
|
||||||
"# $k $r J$ d$\n" +
|
|
||||||
"# '$ $ $\" $~\n" +
|
|
||||||
"# '$ \"$ '$E $\n" +
|
|
||||||
"# $ $L $\" $F ...\n" +
|
|
||||||
"# $. 4B $ $$$*\"\"\"*b\n" +
|
|
||||||
"# '$ $. $$ $$ $F\n" +
|
|
||||||
"# \"$ R$ $F $\" $\n" +
|
|
||||||
"# $k ?$ u* dF .$\n" +
|
|
||||||
"# ^$. $$\" z$ u$$$$e\n" +
|
|
||||||
"# #$b $E.dW@e$\" ?$\n" +
|
|
||||||
"# #$ .o$$# d$$$$c ?F\n" +
|
|
||||||
"# $ .d$$#\" . zo$> #$r .uF\n" +
|
|
||||||
"# $L .u$*\" $&$$$k .$$d$$F\n" +
|
|
||||||
"# $$\" \"\"^\"$$$P\"$P9$\n" +
|
|
||||||
"# JP .o$$$$u:$P $$\n" +
|
|
||||||
"# $ ..ue$\" \"\" $\"\n" +
|
|
||||||
"# d$ $F $\n" +
|
|
||||||
"# $$ ....udE 4B\n" +
|
|
||||||
"# #$ \"\"\"\"` $r @$\n" +
|
|
||||||
"# ^$L '$ $F\n" +
|
|
||||||
"# RN 4N $\n" +
|
|
||||||
"# *$b d$\n" +
|
|
||||||
"# $$k $F\n" +
|
|
||||||
"# $$b $F\n" +
|
|
||||||
"# $\"\" $F\n" +
|
|
||||||
"# '$ $\n" +
|
|
||||||
"# $L $\n" +
|
|
||||||
"# '$ $\n" +
|
|
||||||
"# $ $\n" +
|
|
||||||
"#\n" +
|
|
||||||
"#\n" +
|
|
||||||
"# ┌─┐ ┌─┐\n" +
|
|
||||||
"# ┌──┘ ┴───────┘ ┴──┐\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# │ ─── │\n" +
|
|
||||||
"# │ ─┬┘ └┬─ │\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# │ ─┴─ │\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# └───┐ ┌───┘\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# │ └──────────────┐\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# │ ├─┐\n" +
|
|
||||||
"# │ ┌─┘\n" +
|
|
||||||
"# │ │\n" +
|
|
||||||
"# └─┐ ┐ ┌───────┬──┐ ┌──┘\n" +
|
|
||||||
"# │ ─┤ ─┤ │ ─┤ ─┤\n" +
|
|
||||||
"# └──┴──┘ └──┴──┘\n" +
|
|
||||||
"# 神兽保佑\n" +
|
|
||||||
"# 代码无BUG!\n" +
|
|
||||||
"#\n" +
|
|
||||||
"# ___====-_ _-====___\n" +
|
|
||||||
"# _--^^^#####// \\\\#####^^^--_\n" +
|
|
||||||
"# _-^##########// ( ) \\\\##########^-_\n" +
|
|
||||||
"# -############// |\\^^/| \\\\############-\n" +
|
|
||||||
"# _/############// (@::@) \\\\############\\_\n" +
|
|
||||||
"# /#############(( \\\\// ))#############\\\n" +
|
|
||||||
"# -###############\\\\ (oo) //###############-\n" +
|
|
||||||
"# -#################\\\\ / VV \\ //#################-\n" +
|
|
||||||
"# -###################\\\\/ \\//###################-\n" +
|
|
||||||
"# _#/|##########/\\######( /\\ )######/\\##########|\\#_\n" +
|
|
||||||
"# |/ |#/\\#/\\#/\\/ \\#/\\##\\ | | /##/\\#/ \\/\\#/\\#/\\#| \\|\n" +
|
|
||||||
"# ` |/ V V ` V \\#\\| | | |/#/ V ' V V \\| '\n" +
|
|
||||||
"# ` ` ` ` / | | | | \\ ' ' ' '\n" +
|
|
||||||
"# ( | | | | )\n" +
|
|
||||||
"# __\\ | | | | /__\n" +
|
|
||||||
"# (vvv(VVV)(VVV)vvv)\n" +
|
|
||||||
"# 神兽保佑\n" +
|
|
||||||
"# 代码无BUG!\n" +
|
|
||||||
"# __----~~~~~~~~~~~------___\n" +
|
|
||||||
"# . . ~~//====...... __--~ ~~\n" +
|
|
||||||
"# -. \\_|// |||\\\\ ~~~~~~::::... /~\n" +
|
|
||||||
"# ___-==_ _-~o~ \\/ ||| \\\\ _/~~-\n" +
|
|
||||||
"# __---~~~.==~||\\=_ -_--~/_-~|- |\\\\ \\\\ _/~\n" +
|
|
||||||
"# _-~~ .=~ | \\\\-_ '-~7 /- / || \\ /\n" +
|
|
||||||
"# .~ .~ | \\\\ -_ / /- / || \\ /\n" +
|
|
||||||
"# / ____ / | \\\\ ~-_/ /|- _/ .|| \\ /\n" +
|
|
||||||
"# |~~ ~~|--~~~~--_ \\ ~==-/ | \\~--===~~ .\\\n" +
|
|
||||||
"# ' ~-| /| |-~\\~~ __--~~\n" +
|
|
||||||
"# |-~~-_/ | | ~\\_ _-~ /\\\n" +
|
|
||||||
"# / \\ \\__ \\/~ \\__\n" +
|
|
||||||
"# _--~ _/ | .-~~____--~-/ ~~==.\n" +
|
|
||||||
"# ((->/~ '.|||' -_| ~~-/ , . _||\n" +
|
|
||||||
"# -_ ~\\ ~~---l__i__i__i--~~_/\n" +
|
|
||||||
"# _-~-__ ~) \\--______________--~~\n" +
|
|
||||||
"# //.-~~~-~_--~- |-------~~~~~~~~\n" +
|
|
||||||
"# //.-~~~--\\\n" +
|
|
||||||
"# 神兽保佑\n" +
|
|
||||||
"# 代码无BUG!\n" +
|
|
||||||
"# ,----------------, ,---------,\n" +
|
|
||||||
"# ,-----------------------, ,\" ,\"|\n" +
|
|
||||||
"# ,\" ,\"| ,\" ,\" |\n" +
|
|
||||||
"# +-----------------------+ | ,\" ,\" |\n" +
|
|
||||||
"# | .-----------------. | | +---------+ |\n" +
|
|
||||||
"# | | | | | | -==----'| |\n" +
|
|
||||||
"# | | I LOVE DOS! | | | | | |\n" +
|
|
||||||
"# | | Bad command or | | |/----|`---= | |\n" +
|
|
||||||
"# | | C:\\>_ | | | ,/|==== ooo | ;\n" +
|
|
||||||
"# | | | | | // |(((( [33]| ,\"\n" +
|
|
||||||
"# | `-----------------' |,\" .;'| |(((( | ,\"\n" +
|
|
||||||
"# +-----------------------+ ;; | | |,\"\n" +
|
|
||||||
"# /_)______________(_/ //' | +---------+\n" +
|
|
||||||
"# ___________________________/___ `,\n" +
|
|
||||||
"# / oooooooooooooooo .o. oooo /, \\,\"-----------\n" +
|
|
||||||
"# / ==ooooooooooooooo==.o. ooo= // ,`\\--{)B ,\"\n" +
|
|
||||||
"# /_==__==========__==_ooo__ooo=_/' /___________,\"\n" +
|
|
||||||
"#\n" +
|
|
||||||
"# .-~~~~~~~~~-._ _.-~~~~~~~~~-.\n" +
|
|
||||||
"# __.' ~. .~ `.__\n" +
|
|
||||||
"# .'// \\./ \\\\`.\n" +
|
|
||||||
"# .'// | \\\\`.\n" +
|
|
||||||
"# .'// .-~\"\"\"\"\"\"\"~~~~-._ | _,-~~~~\"\"\"\"\"\"\"~-. \\\\`.\n" +
|
|
||||||
"# .'//.-\" `-. | .-' \"-.\\\\`.\n" +
|
|
||||||
"# .'//______.============-.. \\ | / ..-============.______\\\\`.\n" +
|
|
||||||
"# .'______________________________\\|/______________________________`.");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package com.mhd.bi.config;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BI 开放接口访问控制（请求头 {@code X-BI-Access-Token}）。
|
|
||||||
* <p>配置了 {@code accessToken} 时必须与请求头完全一致；未配置时仅校验请求头非空。</p>
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@ConfigurationProperties(prefix = "mhd.bi")
|
|
||||||
public class BiAccessProperties {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 与 X-BI-Access-Token 比对的密钥；为空则只要请求头非空即可
|
|
||||||
*/
|
|
||||||
private String accessToken = "";
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package com.mhd.bi.config;
|
|
||||||
|
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.core.Ordered;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 注册 /biReport 路径的访问令牌校验
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
@EnableConfigurationProperties(BiAccessProperties.class)
|
|
||||||
public class BiReportAccessConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public FilterRegistrationBean<BiReportAccessTokenFilter> biReportAccessTokenFilter(BiAccessProperties properties) {
|
|
||||||
FilterRegistrationBean<BiReportAccessTokenFilter> registration = new FilterRegistrationBean<>();
|
|
||||||
registration.setFilter(new BiReportAccessTokenFilter(properties));
|
|
||||||
registration.addUrlPatterns("/biReport/*");
|
|
||||||
registration.setOrder(Ordered.HIGHEST_PRECEDENCE + 100);
|
|
||||||
registration.setName("biReportAccessTokenFilter");
|
|
||||||
return registration;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
package com.mhd.bi.config;
|
|
||||||
|
|
||||||
import org.springframework.lang.NonNull;
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
import org.springframework.web.filter.OncePerRequestFilter;
|
|
||||||
|
|
||||||
import javax.servlet.FilterChain;
|
|
||||||
import javax.servlet.ServletException;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 限制 /biReport 下接口必须携带 {@code X-BI-Access-Token}，否则 401。
|
|
||||||
*/
|
|
||||||
public class BiReportAccessTokenFilter extends OncePerRequestFilter {
|
|
||||||
|
|
||||||
private static final String UNAUTHORIZED_MSG = "未认证，请提供有效的访问Token";
|
|
||||||
|
|
||||||
public static final String HEADER_X_BI_ACCESS_TOKEN = "X-BI-Access-Token";
|
|
||||||
|
|
||||||
private final BiAccessProperties accessProperties;
|
|
||||||
|
|
||||||
public BiReportAccessTokenFilter(BiAccessProperties accessProperties) {
|
|
||||||
this.accessProperties = accessProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void doFilterInternal(@NonNull HttpServletRequest request,
|
|
||||||
@NonNull HttpServletResponse response,
|
|
||||||
@NonNull FilterChain filterChain) throws ServletException, IOException {
|
|
||||||
if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
|
|
||||||
filterChain.doFilter(request, response);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String presented = request.getHeader(HEADER_X_BI_ACCESS_TOKEN);
|
|
||||||
if (!StringUtils.hasText(presented)) {
|
|
||||||
writeUnauthorized(response);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String expected = accessProperties.getAccessToken();
|
|
||||||
if (StringUtils.hasText(expected) && !expected.equals(presented)) {
|
|
||||||
writeUnauthorized(response);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
filterChain.doFilter(request, response);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void writeUnauthorized(HttpServletResponse response) throws IOException {
|
|
||||||
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
|
|
||||||
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
|
|
||||||
response.setContentType("application/json;charset=UTF-8");
|
|
||||||
String body = "{\"code\":401,\"msg\":\"" + UNAUTHORIZED_MSG.replace("\"", "\\\"") + "\"}";
|
|
||||||
response.getOutputStream().write(body.getBytes(StandardCharsets.UTF_8));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biComprehensive.repository.mapper;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiReportSnapshotMapperSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.ComprehensiveSituationVO;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 综合态势：SQL 见 BiComprehensiveReportMapper.xml；取数与组装均在 Mapper 层完成。
|
|
||||||
*/
|
|
||||||
public interface BiComprehensiveReportMapper {
|
|
||||||
|
|
||||||
String selectLatestPayloadJson();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 最新快照 → VO（内部调用 {@link #selectLatestPayloadJson()}）
|
|
||||||
*/
|
|
||||||
default ComprehensiveSituationVO loadLatestComprehensive() {
|
|
||||||
return BiReportSnapshotMapperSupport.parsePayload(
|
|
||||||
selectLatestPayloadJson(),
|
|
||||||
ComprehensiveSituationVO.class,
|
|
||||||
BiReportSnapshotMapperSupport::emptyComprehensiveSituation,
|
|
||||||
"综合态势");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biComprehensive.service;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biComprehensive.repository.mapper.BiComprehensiveReportMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.ComprehensiveSituationVO;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 综合态势：数据访问仅经 Mapper（含 XML 内 SQL 与 Mapper 默认方法组装）。
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
public class BiComprehensiveReportService {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BiComprehensiveReportMapper biComprehensiveReportMapper;
|
|
||||||
|
|
||||||
public ComprehensiveSituationVO loadLatestComprehensive() {
|
|
||||||
return biComprehensiveReportMapper.loadLatestComprehensive();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biHkMacaoServiceZone.repository.mapper;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiReportSnapshotMapperSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 港澳服务专区：取 NGWL_TEST_BI.BI_HK_MACAO_SERVICE_ZONE_SNAPSHOT 最新 PAYLOAD_JSON 并解析。
|
|
||||||
*/
|
|
||||||
public interface BiHkMacaoServiceZoneReportMapper {
|
|
||||||
|
|
||||||
String selectLatestPayloadJson();
|
|
||||||
|
|
||||||
default HkMacaoServiceZoneVO loadLatestHkMacaoServiceZone() {
|
|
||||||
return BiReportSnapshotMapperSupport.parsePayload(
|
|
||||||
selectLatestPayloadJson(),
|
|
||||||
HkMacaoServiceZoneVO.class,
|
|
||||||
BiReportSnapshotMapperSupport::emptyHkMacaoServiceZone,
|
|
||||||
"港澳服务专区");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biHkMacaoServiceZone.service;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biHkMacaoServiceZone.repository.mapper.BiHkMacaoServiceZoneReportMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 港澳服务专区
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
public class BiHkMacaoServiceZoneReportService {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BiHkMacaoServiceZoneReportMapper biHkMacaoServiceZoneReportMapper;
|
|
||||||
|
|
||||||
public HkMacaoServiceZoneVO loadLatestHkMacaoServiceZone() {
|
|
||||||
return biHkMacaoServiceZoneReportMapper.loadLatestHkMacaoServiceZone();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-150
@@ -1,150 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biHkMacaoServiceZone.support;
|
|
||||||
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.*;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 港澳服务专区快照演示数据（对齐大屏示例 JSON；后续可改为真实聚合）。
|
|
||||||
*/
|
|
||||||
public final class HkMacaoServiceZoneDemoData {
|
|
||||||
|
|
||||||
private HkMacaoServiceZoneDemoData() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static HkMacaoServiceZoneVO build() {
|
|
||||||
HkOrderStatsVO orderStats = HkOrderStatsVO.builder()
|
|
||||||
.totalOrders(4361L)
|
|
||||||
.unit("单")
|
|
||||||
.momGrowth("+12.5%")
|
|
||||||
.trend("up")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
List<HkPercentageDetailVO> goodsDetails = Arrays.asList(
|
|
||||||
HkPercentageDetailVO.builder().name("广东").percentage("25%").build(),
|
|
||||||
HkPercentageDetailVO.builder().name("澳门").percentage("25%").build(),
|
|
||||||
HkPercentageDetailVO.builder().name("广西").percentage("50%").build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<HkPercentageDetailVO> crossBorderDetails = Arrays.asList(
|
|
||||||
HkPercentageDetailVO.builder().name("出口订单").percentage("25.8%").build(),
|
|
||||||
HkPercentageDetailVO.builder().name("进口订单").percentage("16.8%").build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<HkOrderTrendMonthVO> warehouseOrderTrend = Arrays.asList(
|
|
||||||
HkOrderTrendMonthVO.builder().month("1月").orderRatio(150).orderCount(400).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("2月").orderRatio(200).orderCount(250).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("3月").orderRatio(250).orderCount(300).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("4月").orderRatio(200).orderCount(280).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("5月").orderRatio(280).orderCount(320).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("6月").orderRatio(220).orderCount(310).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("7月").orderRatio(260).orderCount(330).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<HkMonthRatePointVO> turnoverData = Arrays.asList(
|
|
||||||
HkMonthRatePointVO.builder().month("11月").rate(10).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("12月").rate(15).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("1月").rate(22).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("2月").rate(20).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("3月").rate(12).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("4月").rate(16).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<HkMonthValuePointVO> cargoVolumeTrend = Arrays.asList(
|
|
||||||
HkMonthValuePointVO.builder().month("1月").value(80).build(),
|
|
||||||
HkMonthValuePointVO.builder().month("2月").value(85).build(),
|
|
||||||
HkMonthValuePointVO.builder().month("3月").value(90).build(),
|
|
||||||
HkMonthValuePointVO.builder().month("4月").value(70).build(),
|
|
||||||
HkMonthValuePointVO.builder().month("5月").value(95).build(),
|
|
||||||
HkMonthValuePointVO.builder().month("6月").value(88).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<HkOrderTrendMonthVO> transportOrderTrend = Arrays.asList(
|
|
||||||
HkOrderTrendMonthVO.builder().month("1月").orderRatio(150).orderCount(400).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("2月").orderRatio(200).orderCount(250).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("3月").orderRatio(250).orderCount(300).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("4月").orderRatio(200).orderCount(280).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("5月").orderRatio(280).orderCount(320).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("6月").orderRatio(220).orderCount(310).build(),
|
|
||||||
HkOrderTrendMonthVO.builder().month("7月").orderRatio(260).orderCount(330).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<HkMonthRatePointVO> onTimeDeliveryRate = Arrays.asList(
|
|
||||||
HkMonthRatePointVO.builder().month("1月").rate(90).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("2月").rate(92).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("3月").rate(88).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("4月").rate(85).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("5月").rate(95).build(),
|
|
||||||
HkMonthRatePointVO.builder().month("6月").rate(93).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<HkMapPointVO> mapPoints = Arrays.asList(
|
|
||||||
HkMapPointVO.builder()
|
|
||||||
.id("wh_001")
|
|
||||||
.type("warehouse")
|
|
||||||
.name("通宇保税仓")
|
|
||||||
.status("normal")
|
|
||||||
.location(HkMapLocationVO.builder().lat(22.2800).lng(113.5600).build())
|
|
||||||
.metrics(HkWarehouseMetricsVO.builder()
|
|
||||||
.inboundOperations(1)
|
|
||||||
.outboundOperations(1)
|
|
||||||
.build())
|
|
||||||
.build(),
|
|
||||||
HkMapPointVO.builder()
|
|
||||||
.id("vehicle_88888")
|
|
||||||
.type("vehicle")
|
|
||||||
.name("粤A88888")
|
|
||||||
.status("in_transit")
|
|
||||||
.location(HkMapLocationVO.builder().lat(22.2500).lng(113.5500).build())
|
|
||||||
.details(HkVehicleDetailsVO.builder()
|
|
||||||
.warehouseName("通宇")
|
|
||||||
.licensePlate("粤A88888")
|
|
||||||
.loadingAddress("珠海")
|
|
||||||
.destinationAddress("澳门")
|
|
||||||
.currentLocation("珠海市")
|
|
||||||
.updateTime("2026年4月15日 17:52")
|
|
||||||
.build())
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
|
|
||||||
return HkMacaoServiceZoneVO.builder()
|
|
||||||
.warehouseOrderStats(orderStats)
|
|
||||||
.clientServiceStats(HkClientServiceStatsVO.builder()
|
|
||||||
.hkMacaoClients(26)
|
|
||||||
.clientRatio("10.5%")
|
|
||||||
.warehouseUsageArea("1688m2")
|
|
||||||
.areaRatio("1.5%")
|
|
||||||
.build())
|
|
||||||
.goodsSourceStats(HkRingChartStatsVO.builder()
|
|
||||||
.totalOrders(1000)
|
|
||||||
.details(goodsDetails)
|
|
||||||
.build())
|
|
||||||
.crossBorderOrderStats(HkRingChartStatsVO.builder()
|
|
||||||
.totalOrders(400)
|
|
||||||
.details(crossBorderDetails)
|
|
||||||
.build())
|
|
||||||
.warehouseOrderTrend(warehouseOrderTrend)
|
|
||||||
.inventoryTurnoverTrend(HkInventoryTurnoverTrendVO.builder()
|
|
||||||
.currentMonthRate("3次")
|
|
||||||
.annualRate("4次")
|
|
||||||
.unit("次")
|
|
||||||
.data(turnoverData)
|
|
||||||
.build())
|
|
||||||
.transportOrderStats(orderStats)
|
|
||||||
.doorToDoorEfficiency(HkDoorToDoorEfficiencyVO.builder()
|
|
||||||
.averageTime("28.6分")
|
|
||||||
.fastestTime("13.2分")
|
|
||||||
.momGrowth("+30%")
|
|
||||||
.build())
|
|
||||||
.crossBorderTransportStats(HkRingChartStatsVO.builder()
|
|
||||||
.totalOrders(400)
|
|
||||||
.details(crossBorderDetails)
|
|
||||||
.build())
|
|
||||||
.cargoVolumeTrend(cargoVolumeTrend)
|
|
||||||
.transportOrderTrend(transportOrderTrend)
|
|
||||||
.onTimeDeliveryRate(onTimeDeliveryRate)
|
|
||||||
.mapData(HkMapDataVO.builder().points(mapPoints).build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biOverallOperation.repository.mapper;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biOverallOperation.support.OverallOperationPayloadNormalizer;
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiReportSnapshotMapperSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallOperationSituationVO;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总体运营态势：SQL 见 BiOverallOperationReportMapper.xml；取数与组装均在 Mapper 层完成。
|
|
||||||
*/
|
|
||||||
public interface BiOverallOperationReportMapper {
|
|
||||||
|
|
||||||
String selectLatestPayloadJson();
|
|
||||||
|
|
||||||
default OverallOperationSituationVO loadLatestOverallOperation() {
|
|
||||||
String json = OverallOperationPayloadNormalizer.normalizeJson(selectLatestPayloadJson());
|
|
||||||
OverallOperationSituationVO vo = BiReportSnapshotMapperSupport.parsePayload(
|
|
||||||
json,
|
|
||||||
OverallOperationSituationVO.class,
|
|
||||||
BiReportSnapshotMapperSupport::emptyOverallOperationSituation,
|
|
||||||
"总体运营态势");
|
|
||||||
return OverallOperationPayloadNormalizer.ensureDefaults(vo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biOverallOperation.service;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biOverallOperation.repository.mapper.BiOverallOperationReportMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallOperationSituationVO;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 南光物流业务经营分析 · 总体运营态势（大图1）
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
public class BiOverallOperationReportService {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BiOverallOperationReportMapper biOverallOperationReportMapper;
|
|
||||||
|
|
||||||
public OverallOperationSituationVO loadLatestOverallOperation() {
|
|
||||||
return biOverallOperationReportMapper.loadLatestOverallOperation();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-95
@@ -1,95 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biOverallOperation.support;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiInventoryTurnoverTrendSupport;
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiOnTimeDeliveryRateChartSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallOperationSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallTransportOperationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallWarehouseOperationVO;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总体运营态势：左侧 warehouse.turnover_rate_trend；右下角 transport.on_time_rate。
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
public final class OverallOperationPayloadNormalizer {
|
|
||||||
|
|
||||||
private static final ObjectMapper MAPPER = new ObjectMapper();
|
|
||||||
|
|
||||||
private OverallOperationPayloadNormalizer() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String normalizeJson(String json) {
|
|
||||||
if (StringUtils.isBlank(json)) {
|
|
||||||
return json;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
JsonNode root = MAPPER.readTree(json.trim());
|
|
||||||
boolean changed = false;
|
|
||||||
|
|
||||||
ObjectNode rootObj = (ObjectNode) root;
|
|
||||||
JsonNode warehouse = root.path("warehouse");
|
|
||||||
if (warehouse.isObject()) {
|
|
||||||
ObjectNode warehouseObj = (ObjectNode) warehouse;
|
|
||||||
if (warehouseObj.has("map") && !rootObj.has("map")) {
|
|
||||||
rootObj.set("map", warehouseObj.remove("map"));
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
if (warehouseObj.has("transport") && !rootObj.has("transport")) {
|
|
||||||
rootObj.set("transport", warehouseObj.remove("transport"));
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
if (warehouseObj.has("capabilityRanking")) {
|
|
||||||
warehouseObj.remove("capabilityRanking");
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
if (warehouseObj.has("on_time_rate")) {
|
|
||||||
warehouseObj.remove("on_time_rate");
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
if (!warehouseObj.has("turnover_rate_trend")) {
|
|
||||||
warehouseObj.set("turnover_rate_trend",
|
|
||||||
MAPPER.valueToTree(BiInventoryTurnoverTrendSupport.defaultTrend()));
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonNode transport = root.path("transport");
|
|
||||||
if (transport.isObject()) {
|
|
||||||
ObjectNode transportObj = (ObjectNode) transport;
|
|
||||||
if (transportObj.has("enterpriseRanking")) {
|
|
||||||
transportObj.remove("enterpriseRanking");
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
if (!transportObj.has("on_time_rate")) {
|
|
||||||
transportObj.set("on_time_rate",
|
|
||||||
MAPPER.valueToTree(BiOnTimeDeliveryRateChartSupport.defaultChart()));
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return changed ? MAPPER.writeValueAsString(root) : json;
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.warn("总体运营态势 PAYLOAD_JSON 规范化失败，按原 JSON 解析", e);
|
|
||||||
return json;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static OverallOperationSituationVO ensureDefaults(OverallOperationSituationVO vo) {
|
|
||||||
if (vo == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
OverallWarehouseOperationVO warehouse = vo.getWarehouse();
|
|
||||||
if (warehouse != null && BiInventoryTurnoverTrendSupport.isEmpty(warehouse.getTurnoverRateTrend())) {
|
|
||||||
warehouse.setTurnoverRateTrend(BiInventoryTurnoverTrendSupport.defaultTrend());
|
|
||||||
}
|
|
||||||
OverallTransportOperationVO transport = vo.getTransport();
|
|
||||||
if (transport != null && BiOnTimeDeliveryRateChartSupport.isChartEmpty(transport.getOnTimeRate())) {
|
|
||||||
transport.setOnTimeRate(BiOnTimeDeliveryRateChartSupport.defaultChart());
|
|
||||||
}
|
|
||||||
return vo;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biPlatformSurveillance.repository.mapper;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiReportSnapshotMapperSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 月台监测：SQL 见 BiPlatformSurveillanceReportMapper.xml；取数与组装均在 Mapper 层完成。
|
|
||||||
*/
|
|
||||||
public interface BiPlatformSurveillanceReportMapper {
|
|
||||||
|
|
||||||
String selectLatestPayloadJson();
|
|
||||||
|
|
||||||
default PlatformSurveillanceVO loadLatestPlatformSurveillance() {
|
|
||||||
return BiReportSnapshotMapperSupport.parsePayload(
|
|
||||||
selectLatestPayloadJson(),
|
|
||||||
PlatformSurveillanceVO.class,
|
|
||||||
BiReportSnapshotMapperSupport::emptyPlatformSurveillance,
|
|
||||||
"月台监测");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biPlatformSurveillance.service;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biPlatformSurveillance.repository.mapper.BiPlatformSurveillanceReportMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class BiPlatformSurveillanceReportService {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BiPlatformSurveillanceReportMapper biPlatformSurveillanceReportMapper;
|
|
||||||
|
|
||||||
public PlatformSurveillanceVO loadLatestPlatformSurveillance() {
|
|
||||||
return biPlatformSurveillanceReportMapper.loadLatestPlatformSurveillance();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-42
@@ -1,42 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biReport.support;
|
|
||||||
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WhMonthRatePointVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WhTurnoverRateTrendVO;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总体运营态势左侧「库存周转率趋势」默认数据（与仓储运营专区 turnover_rate_trend 结构一致）
|
|
||||||
*/
|
|
||||||
public final class BiInventoryTurnoverTrendSupport {
|
|
||||||
|
|
||||||
private BiInventoryTurnoverTrendSupport() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static WhTurnoverRateTrendVO defaultTrend() {
|
|
||||||
return WhTurnoverRateTrendVO.builder()
|
|
||||||
.currentMonth("3次")
|
|
||||||
.annual("4次")
|
|
||||||
.data(Arrays.asList(
|
|
||||||
WhMonthRatePointVO.builder().month("11月").rate(10).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("12月").rate(15).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("1月").rate(22).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("2月").rate(20).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("3月").rate(12).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("4月").rate(16).build()
|
|
||||||
))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isEmpty(WhTurnoverRateTrendVO trend) {
|
|
||||||
return trend == null || trend.getData() == null || trend.getData().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static WhTurnoverRateTrendVO emptyShell() {
|
|
||||||
return WhTurnoverRateTrendVO.builder()
|
|
||||||
.currentMonth("")
|
|
||||||
.annual("")
|
|
||||||
.data(java.util.Collections.emptyList())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-50
@@ -1,50 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biReport.support;
|
|
||||||
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TrMonthValuePointVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TrTypedChartVO;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 准时配送率折线图（总体运营 transport.on_time_rate、运输运营专区 on_time_rate 共用）
|
|
||||||
*/
|
|
||||||
public final class BiOnTimeDeliveryRateChartSupport {
|
|
||||||
|
|
||||||
private BiOnTimeDeliveryRateChartSupport() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TrTypedChartVO defaultChart() {
|
|
||||||
return TrTypedChartVO.builder()
|
|
||||||
.title("准时配送率")
|
|
||||||
.type("line")
|
|
||||||
.unit("%")
|
|
||||||
.data(defaultMonthPoints())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<TrMonthValuePointVO> defaultMonthPoints() {
|
|
||||||
return Arrays.asList(
|
|
||||||
TrMonthValuePointVO.builder().month("1月").value(98).build(),
|
|
||||||
TrMonthValuePointVO.builder().month("2月").value(96).build(),
|
|
||||||
TrMonthValuePointVO.builder().month("3月").value(85).build(),
|
|
||||||
TrMonthValuePointVO.builder().month("4月").value(70).build(),
|
|
||||||
TrMonthValuePointVO.builder().month("5月").value(92).build(),
|
|
||||||
TrMonthValuePointVO.builder().month("6月").value(90).build()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isChartEmpty(TrTypedChartVO chart) {
|
|
||||||
return chart == null || chart.getData() == null || chart.getData().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TrTypedChartVO emptyChartShell() {
|
|
||||||
return TrTypedChartVO.builder()
|
|
||||||
.title("")
|
|
||||||
.type("")
|
|
||||||
.unit("")
|
|
||||||
.data(Collections.emptyList())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-276
@@ -1,276 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biReport.support;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.ComprehensiveSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.CustomerContributionRankVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.WarehouseTransportSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.*;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TrTypedChartVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.*;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.*;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.*;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.*;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mapper 层使用的快照 JSON 解析与空态（SQL 仅定义在对应 Mapper.xml；查询条件见各 XML：DEL_FLAG=1，按 CREATE_TIME 取最新）
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
public final class BiReportSnapshotMapperSupport {
|
|
||||||
|
|
||||||
private static final ObjectMapper MAPPER = new ObjectMapper();
|
|
||||||
|
|
||||||
private BiReportSnapshotMapperSupport() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> T parsePayload(String json, Class<T> type, Supplier<T> empty, String logLabel) {
|
|
||||||
if (StringUtils.isBlank(json)) {
|
|
||||||
return empty.get();
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
return MAPPER.readValue(json.trim(), type);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.warn("{} PAYLOAD_JSON 解析失败，返回空态", logLabel, e);
|
|
||||||
return empty.get();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ComprehensiveSituationVO emptyComprehensiveSituation() {
|
|
||||||
return ComprehensiveSituationVO.builder()
|
|
||||||
.valueAddedServiceIncome(0L)
|
|
||||||
.inventoryTurnover(0)
|
|
||||||
.orderCount(0)
|
|
||||||
.vehicleUtilizationRate(0d)
|
|
||||||
.fuelConsumptionPerHundredKm(0)
|
|
||||||
.incomeTrend(Collections.emptyList())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static WarehouseTransportSituationVO emptyWarehouseTransportSituation() {
|
|
||||||
return WarehouseTransportSituationVO.builder()
|
|
||||||
.warehouseDistributionOnTimeRate(0d)
|
|
||||||
.currentYearOrders(0L)
|
|
||||||
.currentQuarterOrders(0)
|
|
||||||
.currentMonthOrders(0)
|
|
||||||
.warehouseOrderTrend(Collections.emptyList())
|
|
||||||
.throughput(Collections.emptyList())
|
|
||||||
.currentMonthTurnoverRate(0)
|
|
||||||
.currentYearTurnoverRate(0)
|
|
||||||
.inventoryTurnoverTrend(Collections.emptyList())
|
|
||||||
.totalTransportIncome(0)
|
|
||||||
.orderCount(0)
|
|
||||||
.transportTrips(0)
|
|
||||||
.annualTransportVolume(0)
|
|
||||||
.transportOrderTotal(0)
|
|
||||||
.crossBorderTransportOrder(0)
|
|
||||||
.domesticTransportOrder(0)
|
|
||||||
.transportTripsTrend(Collections.emptyList())
|
|
||||||
.vehicleUtilizationRate(Collections.emptyList())
|
|
||||||
.warehouseDockSyncRate(Collections.emptyList())
|
|
||||||
.customerContributionRank(CustomerContributionRankVO.builder()
|
|
||||||
.customerName(Collections.emptyList())
|
|
||||||
.customerAmount(Collections.emptyList())
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PlatformSurveillanceVO emptyPlatformSurveillance() {
|
|
||||||
return PlatformSurveillanceVO.builder()
|
|
||||||
.vehicles(Collections.emptyList())
|
|
||||||
.efficiencyStatistics(EfficiencyStatisticsVO.builder()
|
|
||||||
.entryOvertimeRate(0).overtimeCount(0).platformOnTimeRate(0)
|
|
||||||
.avgPlatformDuration(0d).yardOnTimeRate(0).avgYardDuration(0d).build())
|
|
||||||
.platformOverview(PlatformOverviewVO.builder()
|
|
||||||
.totalPlatforms(0).currentOccupancyRate(0).operatingPlatforms(0).todayTasks(0).build())
|
|
||||||
.vehicleStatus(VehicleStatusVO.builder()
|
|
||||||
.todayReservedVehicles(0).notCheckedIn(0).operatingVehicles(0).completedVehicles(0).build())
|
|
||||||
.avgOperationDurationTrend(Collections.emptyList())
|
|
||||||
.monthlyTaskStatistics(MonthlyTaskStatisticsVO.builder()
|
|
||||||
.taskTotal(0).taskTotalYoY(0).avgTaskDuration(0d).avgDurationYoY(0)
|
|
||||||
.taskCompletionRate(0).completionRateYoY(0).build())
|
|
||||||
.taskLoadStatistics(Collections.emptyList())
|
|
||||||
.platformAlarmTrend(Collections.emptyList())
|
|
||||||
.taskTypeStatistics(TaskTypeStatisticsVO.builder()
|
|
||||||
.totalTasks(0).taskTypes(Collections.emptyList()).build())
|
|
||||||
.platformAlarmStatistics(PlatformAlarmStatisticsVO.builder()
|
|
||||||
.todayAlarmTotal(0).handled(0).unhandled(0).build())
|
|
||||||
.platformAlarmDistribution(Collections.emptyList())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static OverallOperationSituationVO emptyOverallOperationSituation() {
|
|
||||||
return OverallOperationSituationVO.builder()
|
|
||||||
.updateTime("")
|
|
||||||
.warehouse(OverallWarehouseOperationVO.builder()
|
|
||||||
.orderStatistics(OverallWarehouseOrderStatisticVO.builder()
|
|
||||||
.processedOrderCount(0L).changePercent(0d).build())
|
|
||||||
.coreCapability(OverallWarehouseCoreCapabilityVO.builder()
|
|
||||||
.totalWarehouses(0).selfOperatedCount(0).outsourcedCount(0)
|
|
||||||
.operatingArea(0).areaUnit("")
|
|
||||||
.build())
|
|
||||||
.orderTrendByMonth(Collections.emptyList())
|
|
||||||
.throughputTrendByMonth(Collections.emptyList())
|
|
||||||
.bizStatistics(OverallWarehouseBizStatisticVO.builder()
|
|
||||||
.customerCount(0L).coverageArea("")
|
|
||||||
.annualThroughput(0).throughputUnit("").throughputGrowth(0d)
|
|
||||||
.build())
|
|
||||||
.turnoverRateTrend(BiInventoryTurnoverTrendSupport.defaultTrend())
|
|
||||||
.build())
|
|
||||||
.map(OverallMapSectionVO.builder().nodes(Collections.emptyList()).build())
|
|
||||||
.transport(OverallTransportOperationVO.builder()
|
|
||||||
.orderSummary(OverallTransportOrderSummaryVO.builder()
|
|
||||||
.processedOrderCount(0L).changePercent(0d)
|
|
||||||
.annualFreight(0d).freightUnit("").freightGrowth(0d)
|
|
||||||
.build())
|
|
||||||
.capacityStatistics(OverallTransportCapacityVO.builder()
|
|
||||||
.totalVehicles(0).ownedVehicles(0).socialVehicles(0)
|
|
||||||
.totalDrivers(0).ownedDrivers(0).socialDrivers(0)
|
|
||||||
.build())
|
|
||||||
.orderTrendByMonth(Collections.emptyList())
|
|
||||||
.freightTrendByMonth(Collections.emptyList())
|
|
||||||
.orderDistribution(OverallTransportModeDistributionVO.builder()
|
|
||||||
.crossBorder(0L).domestic(0L).build())
|
|
||||||
.onTimeRate(BiOnTimeDeliveryRateChartSupport.emptyChartShell())
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static WarehouseOperationZoneVO emptyWarehouseOperationZone() {
|
|
||||||
WhColdStorageMetricVO emptyColdMetric = WhColdStorageMetricVO.builder().value("").trend("").build();
|
|
||||||
return WarehouseOperationZoneVO.builder()
|
|
||||||
.warehouseName("")
|
|
||||||
.updateTime("")
|
|
||||||
.orderSummary(WhOrderSummaryVO.builder()
|
|
||||||
.totalCount("")
|
|
||||||
.inboundOrders(WhOrderSummaryCountItemVO.builder().label("").value(0).build())
|
|
||||||
.outboundOrders(WhOrderSummaryCountItemVO.builder().label("").value(0).build())
|
|
||||||
.operationOrders(WhOrderSummaryCountItemVO.builder().label("").value(0).build())
|
|
||||||
.build())
|
|
||||||
.coldStorageStats(WhColdStorageStatsVO.builder()
|
|
||||||
.revenueShare(emptyColdMetric)
|
|
||||||
.utilizationRate(emptyColdMetric)
|
|
||||||
.damageRate(emptyColdMetric)
|
|
||||||
.build())
|
|
||||||
.temperatureExceptions(Collections.emptyList())
|
|
||||||
.storageOverview(WhStorageOverviewVO.builder()
|
|
||||||
.title("").value(0).unit("").subText("").build())
|
|
||||||
.operationStats(WhOperationStatsVO.builder()
|
|
||||||
.title("").value(0).unit("").growthRate("").trend("").build())
|
|
||||||
.businessPlanning(WhBusinessPlanningVO.builder()
|
|
||||||
.generalWarehouse(0).coldStorage(0).foodProcessing(0).automatedStorage(0).build())
|
|
||||||
.throughputTrend(Collections.emptyList())
|
|
||||||
.areaDistribution(WhAreaDistributionVO.builder()
|
|
||||||
.utilizationRate("").details(Collections.emptyList()).build())
|
|
||||||
.capacityUtilizationTrend(WhCapacityUtilizationTrendVO.builder()
|
|
||||||
.peakLabel("").data(Collections.emptyList()).build())
|
|
||||||
.orderStatistics(WhOrderStatisticsVO.builder()
|
|
||||||
.annualOrders(0L).quarterlyOrders(0L).monthlyOrders(0L).build())
|
|
||||||
.serviceStatistics(WhServiceStatisticsVO.builder()
|
|
||||||
.clients(0).coverage("").onTimeRate("").rateChange("").build())
|
|
||||||
.orderTrend(Collections.emptyList())
|
|
||||||
.turnoverRateTrend(WhTurnoverRateTrendVO.builder()
|
|
||||||
.currentMonth("").annual("").data(Collections.emptyList()).build())
|
|
||||||
.serviceCapacity(Collections.emptyList())
|
|
||||||
.realTimeAnalysis(WhRealTimeAnalysisVO.builder()
|
|
||||||
.utilizationRate(WhRealTimeGaugeVO.builder().value("").comparison("").trend("").build())
|
|
||||||
.rentalRate(WhRealTimeGaugeVO.builder().value("").comparison("").trend("").build())
|
|
||||||
.build())
|
|
||||||
.map(WhWarehouseMapVO.builder()
|
|
||||||
.legend("")
|
|
||||||
.nodes(Collections.emptyList())
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TransportOperationZoneVO emptyTransportOperationZone() {
|
|
||||||
TrCapacityCountVO emptyCount = TrCapacityCountVO.builder()
|
|
||||||
.total(0).todayNew(0).yesterdayNew(0).build();
|
|
||||||
return TransportOperationZoneVO.builder()
|
|
||||||
.updateTime("")
|
|
||||||
.dashboardTitle("")
|
|
||||||
.activeTab("")
|
|
||||||
.orderStatistics(TrOrderStatisticsVO.builder().title("").total(0L).trend("").build())
|
|
||||||
.transportStats(TrTransportStatsVO.builder()
|
|
||||||
.title("").tripCount(0).volume(0d).volumeUnit("").build())
|
|
||||||
.orderTypeChart(TrOrderTypeChartVO.builder()
|
|
||||||
.title("").type("").data(Collections.emptyList()).build())
|
|
||||||
.tripCountTrend(TrTypedChartVO.builder()
|
|
||||||
.title("").type("").unit(null).data(Collections.emptyList()).build())
|
|
||||||
.orderTrend(TrTypedChartVO.builder()
|
|
||||||
.title("").type("").unit("").data(Collections.emptyList()).build())
|
|
||||||
.volumeTrend(TrTypedChartVO.builder()
|
|
||||||
.title("").type("").unit("").data(Collections.emptyList()).build())
|
|
||||||
.map(TrVehicleMapVO.builder()
|
|
||||||
.title("")
|
|
||||||
.legend(TrMapLegendVO.builder().idle(0).working(0).build())
|
|
||||||
.nodes(Collections.emptyList())
|
|
||||||
.build())
|
|
||||||
.enterpriseOperation(TrEnterpriseOperationVO.builder()
|
|
||||||
.title("").columns(Collections.emptyList()).list(Collections.emptyList()).build())
|
|
||||||
.capacityStatus(TrCapacityStatusVO.builder()
|
|
||||||
.title("").staff(emptyCount).vehicles(emptyCount).build())
|
|
||||||
.cargoCategory(TrCargoCategoryVO.builder()
|
|
||||||
.title("").totalOrders("").data(Collections.emptyList()).build())
|
|
||||||
.onTimeRate(TrTypedChartVO.builder()
|
|
||||||
.title("").type("").unit("").data(Collections.emptyList()).build())
|
|
||||||
.vehicleUtilization(TrBarChartVO.builder()
|
|
||||||
.title("").unit("").data(Collections.emptyList()).build())
|
|
||||||
.transportSummary(TrTransportSummaryVO.builder()
|
|
||||||
.title("").safeMileage("").avgDeliveryTime("").build())
|
|
||||||
.capacityStats(TrCapacityStatsVO.builder()
|
|
||||||
.vehicles(emptyCapacityStatItem())
|
|
||||||
.drivers(emptyCapacityStatItem())
|
|
||||||
.escorts(emptyCapacityStatItem())
|
|
||||||
.build())
|
|
||||||
.cargoTypeDistribution(TrCargoTypeDistributionVO.builder()
|
|
||||||
.title("").totalOrders(0).totalUnit("").details(Collections.emptyList()).build())
|
|
||||||
.freshOrderStats(emptyBrandOrderStats())
|
|
||||||
.vitasoyOrderStats(emptyBrandOrderStats())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrBrandOrderStatsVO emptyBrandOrderStats() {
|
|
||||||
return TrBrandOrderStatsVO.builder()
|
|
||||||
.plannedDelivery(TrOrderStatMetricVO.builder().value(0).unit("").label("").build())
|
|
||||||
.orderQuantity(TrOrderStatMetricVO.builder().value(0).unit("").label("").build())
|
|
||||||
.vehiclesInTransit(TrOrderStatMetricVO.builder().value(0).unit("").label("").build())
|
|
||||||
.completedDelivery(TrOrderStatTextMetricVO.builder().value("").unit("").label("").build())
|
|
||||||
.overtimeDelivery(TrOrderStatMetricVO.builder().value(0).unit("").label("").build())
|
|
||||||
.onTimeRate(TrOrderStatRateMetricVO.builder().value("").trend("").label("").build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrCapacityStatItemVO emptyCapacityStatItem() {
|
|
||||||
return TrCapacityStatItemVO.builder().value(0).unit("").label("").build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static HkMacaoServiceZoneVO emptyHkMacaoServiceZone() {
|
|
||||||
HkOrderStatsVO emptyOrderStats = HkOrderStatsVO.builder()
|
|
||||||
.totalOrders(0L).unit("").momGrowth("").trend("").build();
|
|
||||||
return HkMacaoServiceZoneVO.builder()
|
|
||||||
.warehouseOrderStats(emptyOrderStats)
|
|
||||||
.clientServiceStats(HkClientServiceStatsVO.builder()
|
|
||||||
.hkMacaoClients(0).clientRatio("").warehouseUsageArea("").areaRatio("").build())
|
|
||||||
.goodsSourceStats(HkRingChartStatsVO.builder()
|
|
||||||
.totalOrders(0).details(Collections.emptyList()).build())
|
|
||||||
.crossBorderOrderStats(HkRingChartStatsVO.builder()
|
|
||||||
.totalOrders(0).details(Collections.emptyList()).build())
|
|
||||||
.warehouseOrderTrend(Collections.emptyList())
|
|
||||||
.inventoryTurnoverTrend(HkInventoryTurnoverTrendVO.builder()
|
|
||||||
.currentMonthRate("").annualRate("").unit("").data(Collections.emptyList()).build())
|
|
||||||
.transportOrderStats(emptyOrderStats)
|
|
||||||
.doorToDoorEfficiency(HkDoorToDoorEfficiencyVO.builder()
|
|
||||||
.averageTime("").fastestTime("").momGrowth("").build())
|
|
||||||
.crossBorderTransportStats(HkRingChartStatsVO.builder()
|
|
||||||
.totalOrders(0).details(Collections.emptyList()).build())
|
|
||||||
.cargoVolumeTrend(Collections.emptyList())
|
|
||||||
.transportOrderTrend(Collections.emptyList())
|
|
||||||
.onTimeDeliveryRate(Collections.emptyList())
|
|
||||||
.mapData(HkMapDataVO.builder().points(Collections.emptyList()).build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biReport.support;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BI 快照表 {@code DEL_FLAG} 取值（三张 *\_SNAPSHOT 表一致）。
|
|
||||||
* <p>查询接口仅返回 {@link #NORMAL}。</p>
|
|
||||||
*/
|
|
||||||
public final class BiSnapshotDelFlag {
|
|
||||||
|
|
||||||
/** 无状态 */
|
|
||||||
public static final int NONE = 0;
|
|
||||||
/** 正常（接口查询可见） */
|
|
||||||
public static final int NORMAL = 1;
|
|
||||||
/** 已删除（逻辑删除，接口不返回） */
|
|
||||||
public static final int DELETED = 2;
|
|
||||||
|
|
||||||
private BiSnapshotDelFlag() {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biSnapshotSync.repository.mapper;
|
|
||||||
|
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BI 快照表写入（定时同步任务使用）
|
|
||||||
*/
|
|
||||||
public interface BiSnapshotWriteMapper {
|
|
||||||
|
|
||||||
int insertComprehensiveSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
|
|
||||||
|
|
||||||
int insertWarehouseTransportSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
|
|
||||||
|
|
||||||
int insertPlatformSurveillanceSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
|
|
||||||
|
|
||||||
int insertOverallOperationSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
|
|
||||||
|
|
||||||
int insertWarehouseOperationZoneSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
|
|
||||||
|
|
||||||
int insertTransportOperationZoneSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
|
|
||||||
|
|
||||||
int insertHkMacaoServiceZoneSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
|
|
||||||
}
|
|
||||||
-28
@@ -1,28 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biSnapshotSync.scheduler;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biSnapshotSync.service.BiReportSnapshotSyncService;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 定时将业务快照写入 BI_COMPREHENSIVE_SNAPSHOT / BI_WAREHOUSE_TRANSPORT_SNAPSHOT / BI_PLATFORM_SURVEILLANCE_SNAPSHOT / BI_OVERALL_OPERATION_SNAPSHOT / BI_WAREHOUSE_OPERATION_ZONE_SNAPSHOT / BI_TRANSPORT_OPERATION_ZONE_SNAPSHOT。
|
|
||||||
* <p>默认关闭，需在配置中设置 {@code mhd.bi.snapshot-sync.enabled=true}。</p>
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@Component
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@ConditionalOnProperty(prefix = "mhd.bi.snapshot-sync", name = "enabled", havingValue = "true")
|
|
||||||
public class BiReportSnapshotSyncScheduler {
|
|
||||||
|
|
||||||
private final BiReportSnapshotSyncService biReportSnapshotSyncService;
|
|
||||||
|
|
||||||
@Scheduled(cron = "${mhd.bi.snapshot-sync.cron:0 0 2 * * ?}")
|
|
||||||
public void runSnapshotSync() {
|
|
||||||
log.info("BI 报表快照定时同步开始");
|
|
||||||
biReportSnapshotSyncService.syncAllSnapshots();
|
|
||||||
log.info("BI 报表快照定时同步结束");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-193
@@ -1,193 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biSnapshotSync.service;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.mhd.bi.domain.biSnapshotSync.repository.mapper.BiSnapshotWriteMapper;
|
|
||||||
import com.mhd.bi.domain.biSnapshotSync.support.BiSnapshotWeeklyRandomDataBuilder;
|
|
||||||
import com.mhd.bi.domain.biHkMacaoServiceZone.support.HkMacaoServiceZoneDemoData;
|
|
||||||
import com.mhd.bi.domain.biTransportOperationZone.support.TransportOperationZoneDemoData;
|
|
||||||
import com.mhd.bi.domain.biWarehouseOperationZone.support.WarehouseOperationZoneDemoData;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.ComprehensiveSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.WarehouseTransportSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallOperationSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BI 快照表定时同步（综合态势 / 仓储运输 / 月台监测 / 总体运营态势 / 仓储运营专区 / 运输运营专区 / 港澳服务专区）。
|
|
||||||
* <p><b>当前（临时）</b>：{@code build*} 使用 {@link BiSnapshotWeeklyRandomDataBuilder}，每次执行使用新的 {@link Random}，
|
|
||||||
* 故<b>同一天多次手动触发、以及每次定时任务执行</b>，生成的模拟数据均<b>不相同</b>（仍在基准 ±20% 内）。</p>
|
|
||||||
* <p><b>后续改造</b>：在各 {@code build*} 中改为查库/Feign 聚合真实业务并组装 VO。</p>
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@Service
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class BiReportSnapshotSyncService {
|
|
||||||
|
|
||||||
private static final String REMARK_SYNC = "scheduled snapshot-sync";
|
|
||||||
|
|
||||||
private final BiSnapshotWriteMapper biSnapshotWriteMapper;
|
|
||||||
private final ObjectMapper objectMapper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 依次同步各快照表；单表失败不影响其它表，只记日志。
|
|
||||||
*/
|
|
||||||
public void syncAllSnapshots() {
|
|
||||||
syncComprehensiveSnapshot();
|
|
||||||
syncWarehouseTransportSnapshot();
|
|
||||||
syncPlatformSurveillanceSnapshot();
|
|
||||||
syncOverallOperationSnapshot();
|
|
||||||
syncWarehouseOperationZoneSnapshot();
|
|
||||||
syncTransportOperationZoneSnapshot();
|
|
||||||
syncHkMacaoServiceZoneSnapshot();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void syncComprehensiveSnapshot() {
|
|
||||||
try {
|
|
||||||
ComprehensiveSituationVO vo = buildComprehensiveSnapshot();
|
|
||||||
String json = objectMapper.writeValueAsString(vo);
|
|
||||||
int rows = biSnapshotWriteMapper.insertComprehensiveSnapshot(json, REMARK_SYNC);
|
|
||||||
if (rows < 1) {
|
|
||||||
log.warn("BI 综合态势快照 INSERT 影响行数为 {}，请确认 NGWL_TEST_BI.BI_COMPREHENSIVE_SNAPSHOT 权限及库是否一致", rows);
|
|
||||||
}
|
|
||||||
log.info("BI 综合态势快照已写入, affectedRows={}", rows);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("BI 综合态势快照同步失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void syncWarehouseTransportSnapshot() {
|
|
||||||
try {
|
|
||||||
WarehouseTransportSituationVO vo = buildWarehouseTransportSnapshot();
|
|
||||||
String json = objectMapper.writeValueAsString(vo);
|
|
||||||
int rows = biSnapshotWriteMapper.insertWarehouseTransportSnapshot(json, REMARK_SYNC);
|
|
||||||
if (rows < 1) {
|
|
||||||
log.warn("BI 仓储运输快照 INSERT 影响行数为 {}，请确认 NGWL_TEST_BI.BI_WAREHOUSE_TRANSPORT_SNAPSHOT", rows);
|
|
||||||
}
|
|
||||||
log.info("BI 仓储运输快照已写入, affectedRows={}", rows);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("BI 仓储运输快照同步失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void syncPlatformSurveillanceSnapshot() {
|
|
||||||
try {
|
|
||||||
PlatformSurveillanceVO vo = buildPlatformSurveillanceSnapshot();
|
|
||||||
String json = objectMapper.writeValueAsString(vo);
|
|
||||||
int rows = biSnapshotWriteMapper.insertPlatformSurveillanceSnapshot(json, REMARK_SYNC);
|
|
||||||
if (rows < 1) {
|
|
||||||
log.warn("BI 月台监测快照 INSERT 影响行数为 {}，请确认 NGWL_TEST_BI.BI_PLATFORM_SURVEILLANCE_SNAPSHOT", rows);
|
|
||||||
}
|
|
||||||
log.info("BI 月台监测快照已写入, affectedRows={}", rows);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("BI 月台监测快照同步失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void syncOverallOperationSnapshot() {
|
|
||||||
try {
|
|
||||||
OverallOperationSituationVO vo = buildOverallOperationSnapshot();
|
|
||||||
String json = objectMapper.writeValueAsString(vo);
|
|
||||||
int rows = biSnapshotWriteMapper.insertOverallOperationSnapshot(json, REMARK_SYNC);
|
|
||||||
if (rows < 1) {
|
|
||||||
log.warn("BI 总体运营态势快照 INSERT 影响行数为 {}，请确认 NGWL_TEST_BI.BI_OVERALL_OPERATION_SNAPSHOT", rows);
|
|
||||||
}
|
|
||||||
log.info("BI 总体运营态势快照已写入, affectedRows={}", rows);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("BI 总体运营态势快照同步失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void syncWarehouseOperationZoneSnapshot() {
|
|
||||||
try {
|
|
||||||
WarehouseOperationZoneVO vo = buildWarehouseOperationZoneSnapshot();
|
|
||||||
String json = objectMapper.writeValueAsString(vo);
|
|
||||||
int rows = biSnapshotWriteMapper.insertWarehouseOperationZoneSnapshot(json, REMARK_SYNC);
|
|
||||||
if (rows < 1) {
|
|
||||||
log.warn("BI 仓储运营专区快照 INSERT 影响行数为 {}，请确认 NGWL_TEST_BI.BI_WAREHOUSE_OPERATION_ZONE_SNAPSHOT", rows);
|
|
||||||
}
|
|
||||||
log.info("BI 仓储运营专区快照已写入, affectedRows={}", rows);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("BI 仓储运营专区快照同步失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO 业务落地：改为查询真实数据组装 VO。临时实现见 {@link BiSnapshotWeeklyRandomDataBuilder#overallOperation(Random)}。
|
|
||||||
*/
|
|
||||||
protected OverallOperationSituationVO buildOverallOperationSnapshot() {
|
|
||||||
return BiSnapshotWeeklyRandomDataBuilder.overallOperation(new Random());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO 业务落地：改为查询真实数据组装 VO。临时实现见 {@link BiSnapshotWeeklyRandomDataBuilder#comprehensive(Random)}。
|
|
||||||
*/
|
|
||||||
protected ComprehensiveSituationVO buildComprehensiveSnapshot() {
|
|
||||||
return BiSnapshotWeeklyRandomDataBuilder.comprehensive(new Random());
|
|
||||||
}
|
|
||||||
|
|
||||||
/** TODO 业务落地：改为查询真实数据。临时实现见 {@link BiSnapshotWeeklyRandomDataBuilder#warehouseTransport(Random)}。 */
|
|
||||||
protected WarehouseTransportSituationVO buildWarehouseTransportSnapshot() {
|
|
||||||
return BiSnapshotWeeklyRandomDataBuilder.warehouseTransport(new Random());
|
|
||||||
}
|
|
||||||
|
|
||||||
/** TODO 业务落地：改为查询真实数据。临时实现见 {@link BiSnapshotWeeklyRandomDataBuilder#platformSurveillance(Random)}。 */
|
|
||||||
protected PlatformSurveillanceVO buildPlatformSurveillanceSnapshot() {
|
|
||||||
return BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(new Random());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO 业务落地：改为查询真实数据组装 VO。当前为 {@link WarehouseOperationZoneDemoData} 静态示例。
|
|
||||||
*/
|
|
||||||
protected WarehouseOperationZoneVO buildWarehouseOperationZoneSnapshot() {
|
|
||||||
return WarehouseOperationZoneDemoData.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void syncTransportOperationZoneSnapshot() {
|
|
||||||
try {
|
|
||||||
TransportOperationZoneVO vo = buildTransportOperationZoneSnapshot();
|
|
||||||
String json = objectMapper.writeValueAsString(vo);
|
|
||||||
int rows = biSnapshotWriteMapper.insertTransportOperationZoneSnapshot(json, REMARK_SYNC);
|
|
||||||
if (rows < 1) {
|
|
||||||
log.warn("BI 运输运营专区快照 INSERT 影响行数为 {}，请确认 NGWL_TEST_BI.BI_TRANSPORT_OPERATION_ZONE_SNAPSHOT", rows);
|
|
||||||
}
|
|
||||||
log.info("BI 运输运营专区快照已写入, affectedRows={}", rows);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("BI 运输运营专区快照同步失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO 业务落地：改为查询真实数据组装 VO。当前为 {@link TransportOperationZoneDemoData} 静态示例。
|
|
||||||
*/
|
|
||||||
protected TransportOperationZoneVO buildTransportOperationZoneSnapshot() {
|
|
||||||
return TransportOperationZoneDemoData.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void syncHkMacaoServiceZoneSnapshot() {
|
|
||||||
try {
|
|
||||||
HkMacaoServiceZoneVO vo = buildHkMacaoServiceZoneSnapshot();
|
|
||||||
String json = objectMapper.writeValueAsString(vo);
|
|
||||||
int rows = biSnapshotWriteMapper.insertHkMacaoServiceZoneSnapshot(json, REMARK_SYNC);
|
|
||||||
if (rows < 1) {
|
|
||||||
log.warn("BI 港澳服务专区快照 INSERT 影响行数为 {}，请确认 NGWL_TEST_BI.BI_HK_MACAO_SERVICE_ZONE_SNAPSHOT", rows);
|
|
||||||
}
|
|
||||||
log.info("BI 港澳服务专区快照已写入, affectedRows={}", rows);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("BI 港澳服务专区快照同步失败", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO 业务落地：改为查询真实数据组装 VO。当前为 {@link HkMacaoServiceZoneDemoData} 静态示例。
|
|
||||||
*/
|
|
||||||
protected HkMacaoServiceZoneVO buildHkMacaoServiceZoneSnapshot() {
|
|
||||||
return HkMacaoServiceZoneDemoData.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-437
@@ -1,437 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biSnapshotSync.support;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiOnTimeDeliveryRateChartSupport;
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiInventoryTurnoverTrendSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.ComprehensiveSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.CustomerContributionRankVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.WarehouseTransportSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.*;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.*;
|
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <b>临时</b>：在基准 ±20% 内生成模拟快照（基准对齐 insert_bi_snapshots_alternate_row_dm）。
|
|
||||||
* 调用 {@link #comprehensive(Random)} 等时须传入 {@link Random}：<b>每次 {@code new Random()} 则每次结果不同</b>；
|
|
||||||
* 若需可重复（如单测），可传入 {@link #randomForDate(java.time.LocalDate, long)} 等有固定种子的实例。
|
|
||||||
*/
|
|
||||||
public final class BiSnapshotWeeklyRandomDataBuilder {
|
|
||||||
|
|
||||||
private BiSnapshotWeeklyRandomDataBuilder() {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 固定种子（如同日多次一致），适用于单元测试等；生产模拟同步请使用 {@code new Random()}。
|
|
||||||
*/
|
|
||||||
public static Random randomForDate(LocalDate date, long salt) {
|
|
||||||
long epochDay = date.toEpochDay();
|
|
||||||
salt = salt % 1000000007L;
|
|
||||||
return new Random(epochDay * 1_000_003L + salt * 7919L);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated 请使用 {@link #randomForDate(LocalDate, long)}；历史方法名保留兼容，现已按「自然日」而非 ISO 周。
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static Random randomForWeekOf(LocalDate date, long salt) {
|
|
||||||
return randomForDate(date, salt);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static Random randomForWeekOf(LocalDate date) {
|
|
||||||
return randomForDate(date, 0L);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static double jitterFactor(Random r) {
|
|
||||||
return 0.8 + r.nextDouble() * 0.4;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int jitterInt(int base, Random r) {
|
|
||||||
return (int) Math.round(base * jitterFactor(r));
|
|
||||||
}
|
|
||||||
|
|
||||||
static long jitterLong(long base, Random r) {
|
|
||||||
return Math.round(base * jitterFactor(r));
|
|
||||||
}
|
|
||||||
|
|
||||||
static double jitterDouble(double base, Random r) {
|
|
||||||
return Math.round(base * jitterFactor(r) * 10.0) / 10.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int jitterPercentInt(int base, Random r) {
|
|
||||||
return Math.min(100, Math.max(0, jitterInt(base, r)));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static double jitterPercentDouble(double base, Random r) {
|
|
||||||
double v = base * jitterFactor(r);
|
|
||||||
return Math.min(100.0, Math.max(0.0, Math.round(v * 10.0) / 10.0));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<Integer> jitterIntArray(int[] arr, Random r) {
|
|
||||||
return Arrays.stream(arr).map(v -> jitterInt(v, r)).boxed().collect(Collectors.toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ComprehensiveSituationVO comprehensive(Random r) {
|
|
||||||
return ComprehensiveSituationVO.builder()
|
|
||||||
.valueAddedServiceIncome(jitterLong(Baseline.COMP_INCOME, r))
|
|
||||||
.inventoryTurnover(Math.max(1, jitterInt(Baseline.COMP_TURNOVER, r)))
|
|
||||||
.orderCount(Math.max(0, jitterInt(Baseline.COMP_ORDERS, r)))
|
|
||||||
.vehicleUtilizationRate(jitterPercentDouble(Baseline.COMP_VEHICLE_PCT, r))
|
|
||||||
.fuelConsumptionPerHundredKm(Math.max(1, jitterInt(Baseline.COMP_FUEL, r)))
|
|
||||||
.incomeTrend(jitterIntArray(Baseline.COMP_INCOME_TREND, r))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static WarehouseTransportSituationVO warehouseTransport(Random r) {
|
|
||||||
List<Integer> dock = new ArrayList<>();
|
|
||||||
for (int v : Baseline.W_DOCK) {
|
|
||||||
dock.add(jitterPercentInt(v, r));
|
|
||||||
}
|
|
||||||
List<Integer> custAmt = new ArrayList<>();
|
|
||||||
for (int v : Baseline.W_CUST_AMT) {
|
|
||||||
custAmt.add(jitterInt(v, r));
|
|
||||||
}
|
|
||||||
return WarehouseTransportSituationVO.builder()
|
|
||||||
.warehouseDistributionOnTimeRate(jitterPercentDouble(Baseline.W_WH_RATE, r))
|
|
||||||
.currentYearOrders(jitterLong(Baseline.W_YEAR_ORD, r))
|
|
||||||
.currentQuarterOrders(Math.max(0, jitterInt(Baseline.W_Q_ORD, r)))
|
|
||||||
.currentMonthOrders(Math.max(0, jitterInt(Baseline.W_M_ORD, r)))
|
|
||||||
.warehouseOrderTrend(jitterIntArray(Baseline.W_WH_TREND, r))
|
|
||||||
.throughput(jitterIntArray(Baseline.W_THROUGH, r))
|
|
||||||
.currentMonthTurnoverRate(Math.max(1, jitterInt(Baseline.W_M_TOR, r)))
|
|
||||||
.currentYearTurnoverRate(Math.max(1, jitterInt(Baseline.W_Y_TOR, r)))
|
|
||||||
.inventoryTurnoverTrend(jitterIntArray(Baseline.W_INV_TR, r))
|
|
||||||
.totalTransportIncome(Math.max(0, jitterInt(Baseline.W_INCOME, r)))
|
|
||||||
.orderCount(Math.max(0, jitterInt(Baseline.W_ORD, r)))
|
|
||||||
.transportTrips(Math.max(0, jitterInt(Baseline.W_TRIPS, r)))
|
|
||||||
.annualTransportVolume(Math.max(0, jitterInt(Baseline.W_VOL, r)))
|
|
||||||
.transportOrderTotal(Math.max(0, jitterInt(Baseline.W_TOT, r)))
|
|
||||||
.crossBorderTransportOrder(Math.max(0, jitterInt(Baseline.W_CB, r)))
|
|
||||||
.domesticTransportOrder(Math.max(0, jitterInt(Baseline.W_DM, r)))
|
|
||||||
.transportTripsTrend(jitterIntArray(Baseline.W_TRIP_TR, r))
|
|
||||||
.vehicleUtilizationRate(jitterIntArray(Baseline.W_VEH_UT, r))
|
|
||||||
.warehouseDockSyncRate(dock)
|
|
||||||
.customerContributionRank(CustomerContributionRankVO.builder()
|
|
||||||
.customerName(Arrays.asList(Baseline.W_CUST_NAMES))
|
|
||||||
.customerAmount(custAmt)
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PlatformSurveillanceVO platformSurveillance(Random r) {
|
|
||||||
List<PlatformVehicleItemVO> vehicles = new ArrayList<>();
|
|
||||||
for (String[] row : Baseline.P_PLATES) {
|
|
||||||
int dur = jitterInt(Integer.parseInt(row[3]), r);
|
|
||||||
vehicles.add(PlatformVehicleItemVO.builder()
|
|
||||||
.plateNumber(row[0])
|
|
||||||
.status(row[1])
|
|
||||||
.platformId(row[2])
|
|
||||||
.platformDuration(Math.max(1, dur))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
EfficiencyStatisticsVO eff = EfficiencyStatisticsVO.builder()
|
|
||||||
.entryOvertimeRate(jitterPercentInt(Baseline.P_ENT_OT, r))
|
|
||||||
.overtimeCount(Math.max(0, jitterInt(Baseline.P_OT_CNT, r)))
|
|
||||||
.platformOnTimeRate(jitterPercentInt(Baseline.P_PL_OT, r))
|
|
||||||
.avgPlatformDuration(Math.max(0.1, jitterDouble(Baseline.P_AVG_PL, r)))
|
|
||||||
.yardOnTimeRate(jitterPercentInt(Baseline.P_YD_OT, r))
|
|
||||||
.avgYardDuration(Math.max(0.1, jitterDouble(Baseline.P_AVG_YD, r)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
PlatformOverviewVO overview = PlatformOverviewVO.builder()
|
|
||||||
.totalPlatforms(Math.max(1, jitterInt(Baseline.P_TOT_PL, r)))
|
|
||||||
.currentOccupancyRate(jitterPercentInt(Baseline.P_OCC, r))
|
|
||||||
.operatingPlatforms(Math.max(0, jitterInt(Baseline.P_OP, r)))
|
|
||||||
.todayTasks(Math.max(0, jitterInt(Baseline.P_TASKS, r)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
VehicleStatusVO vs = VehicleStatusVO.builder()
|
|
||||||
.todayReservedVehicles(Math.max(0, jitterInt(Baseline.P_RESV, r)))
|
|
||||||
.notCheckedIn(Math.max(0, jitterInt(Baseline.P_NC, r)))
|
|
||||||
.operatingVehicles(Math.max(0, jitterInt(Baseline.P_OPV, r)))
|
|
||||||
.completedVehicles(Math.max(0, jitterInt(Baseline.P_DONE, r)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
List<AvgOperationDurationTrendItemVO> avgTrend = new ArrayList<>();
|
|
||||||
for (int i = 0; i < Baseline.P_MO_LABELS.length; i++) {
|
|
||||||
avgTrend.add(AvgOperationDurationTrendItemVO.builder()
|
|
||||||
.month(Baseline.P_MO_LABELS[i])
|
|
||||||
.yardDuration(Math.max(0.0, jitterDouble(Baseline.P_YD_D[i], r)))
|
|
||||||
.platformDuration(Math.max(0.0, jitterDouble(Baseline.P_PL_D[i], r)))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
MonthlyTaskStatisticsVO monthly = MonthlyTaskStatisticsVO.builder()
|
|
||||||
.taskTotal(Math.max(0, jitterInt(Baseline.P_MT_TOT, r)))
|
|
||||||
.taskTotalYoY(jitterInt(Baseline.P_MT_YOY, r))
|
|
||||||
.avgTaskDuration(Math.max(0.1, jitterDouble(Baseline.P_MT_AVG, r)))
|
|
||||||
.avgDurationYoY(jitterInt(Baseline.P_MT_AVG_YOY, r))
|
|
||||||
.taskCompletionRate(jitterPercentInt(Baseline.P_MT_CR, r))
|
|
||||||
.completionRateYoY(jitterInt(Baseline.P_MT_CR_YOY, r))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
List<TaskLoadItemVO> load = new ArrayList<>();
|
|
||||||
for (int i = 0; i < Baseline.P_LOAD_T.length; i++) {
|
|
||||||
load.add(TaskLoadItemVO.builder()
|
|
||||||
.time(Baseline.P_LOAD_T[i])
|
|
||||||
.taskCount(Math.max(0, jitterInt(Baseline.P_LOAD_C[i], r)))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
List<PlatformAlarmTrendItemVO> alarmTrend = new ArrayList<>();
|
|
||||||
for (int i = 0; i < Baseline.P_AL_D.length; i++) {
|
|
||||||
alarmTrend.add(PlatformAlarmTrendItemVO.builder()
|
|
||||||
.date(Baseline.P_AL_D[i])
|
|
||||||
.alarmCount(Math.max(0, jitterInt(Baseline.P_AL_C[i], r)))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
List<TaskTypeCountItemVO> typeCounts = new ArrayList<>();
|
|
||||||
for (int i = 0; i < Baseline.P_TT_TYPES.length; i++) {
|
|
||||||
typeCounts.add(TaskTypeCountItemVO.builder()
|
|
||||||
.type(Baseline.P_TT_TYPES[i])
|
|
||||||
.count(Math.max(0, jitterInt(Baseline.P_TT_CNT[i], r)))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
int todayAl = Math.max(0, jitterInt(Baseline.P_AL_TOT, r));
|
|
||||||
int handled = Math.max(0, jitterInt(Baseline.P_AL_H, r));
|
|
||||||
handled = Math.min(handled, todayAl);
|
|
||||||
int unhandled = Math.max(0, todayAl - handled);
|
|
||||||
|
|
||||||
List<PlatformAlarmDistItemVO> dist = new ArrayList<>();
|
|
||||||
for (int i = 0; i < Baseline.P_DIST_T.length; i++) {
|
|
||||||
dist.add(PlatformAlarmDistItemVO.builder()
|
|
||||||
.type(Baseline.P_DIST_T[i])
|
|
||||||
.count(Math.max(0, jitterInt(Baseline.P_DIST_C[i], r)))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
return PlatformSurveillanceVO.builder()
|
|
||||||
.vehicles(vehicles)
|
|
||||||
.efficiencyStatistics(eff)
|
|
||||||
.platformOverview(overview)
|
|
||||||
.vehicleStatus(vs)
|
|
||||||
.avgOperationDurationTrend(avgTrend)
|
|
||||||
.monthlyTaskStatistics(monthly)
|
|
||||||
.taskLoadStatistics(load)
|
|
||||||
.platformAlarmTrend(alarmTrend)
|
|
||||||
.taskTypeStatistics(TaskTypeStatisticsVO.builder()
|
|
||||||
.totalTasks(Math.max(0, jitterInt(Baseline.P_TT_TOT, r)))
|
|
||||||
.taskTypes(typeCounts)
|
|
||||||
.build())
|
|
||||||
.platformAlarmStatistics(PlatformAlarmStatisticsVO.builder()
|
|
||||||
.todayAlarmTotal(todayAl)
|
|
||||||
.handled(handled)
|
|
||||||
.unhandled(unhandled)
|
|
||||||
.build())
|
|
||||||
.platformAlarmDistribution(dist)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 总体运营态势：与 {@code create_bi_overall_operation_dm.sql} 内置 PAYLOAD_JSON 一致（不随 Random 抖动）。
|
|
||||||
*/
|
|
||||||
public static OverallOperationSituationVO overallOperation(Random r) {
|
|
||||||
return overallReferenceDashboard();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 与产品约定返回值示例一致，供快照同步与联调。
|
|
||||||
* 左侧 {@code warehouse.turnover_rate_trend} 库存周转率趋势；右下角 {@code transport.on_time_rate} 准时配送率。
|
|
||||||
*/
|
|
||||||
public static OverallOperationSituationVO overallReferenceDashboard() {
|
|
||||||
return OverallOperationSituationVO.builder()
|
|
||||||
.updateTime("2026-05-11 10:55:00")
|
|
||||||
.warehouse(OverallWarehouseOperationVO.builder()
|
|
||||||
.orderStatistics(OverallWarehouseOrderStatisticVO.builder()
|
|
||||||
.processedOrderCount(6767L)
|
|
||||||
.changePercent(5.4)
|
|
||||||
.build())
|
|
||||||
.coreCapability(OverallWarehouseCoreCapabilityVO.builder()
|
|
||||||
.totalWarehouses(10)
|
|
||||||
.selfOperatedCount(4)
|
|
||||||
.outsourcedCount(6)
|
|
||||||
.operatingArea(28)
|
|
||||||
.areaUnit("万m²")
|
|
||||||
.build())
|
|
||||||
.orderTrendByMonth(Arrays.asList(
|
|
||||||
OverallWarehouseOrderTrendMonthVO.builder().monthLabel("1月").inboundOrders(700L).outboundOrders(450L).build(),
|
|
||||||
OverallWarehouseOrderTrendMonthVO.builder().monthLabel("2月").inboundOrders(900L).outboundOrders(550L).build(),
|
|
||||||
OverallWarehouseOrderTrendMonthVO.builder().monthLabel("3月").inboundOrders(800L).outboundOrders(480L).build(),
|
|
||||||
OverallWarehouseOrderTrendMonthVO.builder().monthLabel("4月").inboundOrders(550L).outboundOrders(300L).build(),
|
|
||||||
OverallWarehouseOrderTrendMonthVO.builder().monthLabel("5月").inboundOrders(750L).outboundOrders(350L).build(),
|
|
||||||
OverallWarehouseOrderTrendMonthVO.builder().monthLabel("6月").inboundOrders(580L).outboundOrders(320L).build(),
|
|
||||||
OverallWarehouseOrderTrendMonthVO.builder().monthLabel("7月").inboundOrders(780L).outboundOrders(400L).build()
|
|
||||||
))
|
|
||||||
.throughputTrendByMonth(Arrays.asList(
|
|
||||||
OverallThroughputTrendMonthVO.builder().monthLabel("11月").throughput(10).build(),
|
|
||||||
OverallThroughputTrendMonthVO.builder().monthLabel("12月").throughput(14).build(),
|
|
||||||
OverallThroughputTrendMonthVO.builder().monthLabel("1月").throughput(23).build(),
|
|
||||||
OverallThroughputTrendMonthVO.builder().monthLabel("2月").throughput(22).build(),
|
|
||||||
OverallThroughputTrendMonthVO.builder().monthLabel("3月").throughput(17).build(),
|
|
||||||
OverallThroughputTrendMonthVO.builder().monthLabel("4月").throughput(18).build(),
|
|
||||||
OverallThroughputTrendMonthVO.builder().monthLabel("5月").throughput(9).build()
|
|
||||||
))
|
|
||||||
.bizStatistics(OverallWarehouseBizStatisticVO.builder()
|
|
||||||
.customerCount(582L)
|
|
||||||
.coverageArea("覆盖港珠澳")
|
|
||||||
.annualThroughput(26)
|
|
||||||
.throughputUnit("万吨")
|
|
||||||
.throughputGrowth(8.5)
|
|
||||||
.build())
|
|
||||||
.turnoverRateTrend(BiInventoryTurnoverTrendSupport.defaultTrend())
|
|
||||||
.build())
|
|
||||||
.map(OverallMapSectionVO.builder()
|
|
||||||
.nodes(Arrays.asList(
|
|
||||||
OverallMapNodeVO.builder()
|
|
||||||
.type("headquarters")
|
|
||||||
.name("总部")
|
|
||||||
.location(Arrays.asList(113.55, 22.25, 0.0))
|
|
||||||
.build(),
|
|
||||||
OverallMapNodeVO.builder()
|
|
||||||
.type("businessUnit")
|
|
||||||
.name("业务单元")
|
|
||||||
.location(Arrays.asList(113.55, 22.20, 0.0))
|
|
||||||
.tooltip(OverallMapTooltipVO.builder()
|
|
||||||
.title("通宇业务情况分析")
|
|
||||||
.data(Arrays.asList(
|
|
||||||
OverallMapTooltipDataItemVO.builder().label("在途车辆").value(3).build(),
|
|
||||||
OverallMapTooltipDataItemVO.builder().label("在途订单").value(11).build()
|
|
||||||
))
|
|
||||||
.build())
|
|
||||||
.build(),
|
|
||||||
OverallMapNodeVO.builder()
|
|
||||||
.type("warehouse")
|
|
||||||
.name("通宇保税仓")
|
|
||||||
.location(Arrays.asList(114.16, 22.28, 0.0))
|
|
||||||
.tooltip(OverallMapTooltipVO.builder()
|
|
||||||
.title("通宇保税仓情况分析")
|
|
||||||
.data(Arrays.asList(
|
|
||||||
OverallMapTooltipDataItemVO.builder().label("入库作业").value(1).build(),
|
|
||||||
OverallMapTooltipDataItemVO.builder().label("出库作业").value(1).build()
|
|
||||||
))
|
|
||||||
.build())
|
|
||||||
.build()
|
|
||||||
))
|
|
||||||
.build())
|
|
||||||
.transport(OverallTransportOperationVO.builder()
|
|
||||||
.orderSummary(OverallTransportOrderSummaryVO.builder()
|
|
||||||
.processedOrderCount(5240L)
|
|
||||||
.changePercent(6.2)
|
|
||||||
.annualFreight(2.6)
|
|
||||||
.freightUnit("万吨")
|
|
||||||
.freightGrowth(8.5)
|
|
||||||
.build())
|
|
||||||
.capacityStatistics(OverallTransportCapacityVO.builder()
|
|
||||||
.totalVehicles(320)
|
|
||||||
.ownedVehicles(100)
|
|
||||||
.socialVehicles(220)
|
|
||||||
.totalDrivers(400)
|
|
||||||
.ownedDrivers(160)
|
|
||||||
.socialDrivers(240)
|
|
||||||
.build())
|
|
||||||
.orderTrendByMonth(Arrays.asList(
|
|
||||||
OverallTransportOrderTrendMonthVO.builder().monthLabel("1月").count(100L).build(),
|
|
||||||
OverallTransportOrderTrendMonthVO.builder().monthLabel("2月").count(120L).build(),
|
|
||||||
OverallTransportOrderTrendMonthVO.builder().monthLabel("3月").count(230L).build(),
|
|
||||||
OverallTransportOrderTrendMonthVO.builder().monthLabel("4月").count(110L).build(),
|
|
||||||
OverallTransportOrderTrendMonthVO.builder().monthLabel("5月").count(150L).build(),
|
|
||||||
OverallTransportOrderTrendMonthVO.builder().monthLabel("6月").count(200L).build()
|
|
||||||
))
|
|
||||||
.freightTrendByMonth(Arrays.asList(
|
|
||||||
OverallTransportFreightTrendMonthVO.builder().monthLabel("1月").freight(80).build(),
|
|
||||||
OverallTransportFreightTrendMonthVO.builder().monthLabel("2月").freight(110).build(),
|
|
||||||
OverallTransportFreightTrendMonthVO.builder().monthLabel("3月").freight(240).build(),
|
|
||||||
OverallTransportFreightTrendMonthVO.builder().monthLabel("4月").freight(100).build(),
|
|
||||||
OverallTransportFreightTrendMonthVO.builder().monthLabel("5月").freight(140).build(),
|
|
||||||
OverallTransportFreightTrendMonthVO.builder().monthLabel("6月").freight(190).build()
|
|
||||||
))
|
|
||||||
.orderDistribution(OverallTransportModeDistributionVO.builder()
|
|
||||||
.crossBorder(2400L)
|
|
||||||
.domestic(2300L)
|
|
||||||
.build())
|
|
||||||
.onTimeRate(BiOnTimeDeliveryRateChartSupport.defaultChart())
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 基准与 SQL 脚本 alternate sample 一致
|
|
||||||
*/
|
|
||||||
private static final class Baseline {
|
|
||||||
static final long COMP_INCOME = 6_185_000L;
|
|
||||||
static final int COMP_TURNOVER = 18;
|
|
||||||
static final int COMP_ORDERS = 50_120;
|
|
||||||
static final double COMP_VEHICLE_PCT = 93.2;
|
|
||||||
static final int COMP_FUEL = 12;
|
|
||||||
static final int[] COMP_INCOME_TREND = {195, 248, 302, 415, 366, 488};
|
|
||||||
|
|
||||||
static final double W_WH_RATE = 96.8;
|
|
||||||
static final long W_YEAR_ORD = 612_800L;
|
|
||||||
static final int W_Q_ORD = 198_600;
|
|
||||||
static final int W_M_ORD = 28_440;
|
|
||||||
static final int[] W_WH_TREND = {82, 91, 77, 68, 103, 89};
|
|
||||||
static final int[] W_THROUGH = {18, 11, 26, 15, 9, 21};
|
|
||||||
static final int W_M_TOR = 4;
|
|
||||||
static final int W_Y_TOR = 5;
|
|
||||||
static final int[] W_INV_TR = {16, 19, 11, 24, 18, 14};
|
|
||||||
static final int W_INCOME = 7_230;
|
|
||||||
static final int W_ORD = 912;
|
|
||||||
static final int W_TRIPS = 601;
|
|
||||||
static final int W_VOL = 22;
|
|
||||||
static final int W_TOT = 5_100;
|
|
||||||
static final int W_CB = 2_680;
|
|
||||||
static final int W_DM = 2_420;
|
|
||||||
static final int[] W_TRIP_TR = {120, 95, 210, 155, 88, 175};
|
|
||||||
static final int[] W_VEH_UT = {520, 410, 380, 500, 590, 480};
|
|
||||||
static final int[] W_DOCK = {96, 91, 82, 75, 99, 88};
|
|
||||||
static final String[] W_CUST_NAMES = {"华东冷链", "华南汽配", "西南快消", "华北家电", "跨境达"};
|
|
||||||
static final int[] W_CUST_AMT = {198, 172, 205, 189, 221};
|
|
||||||
|
|
||||||
static final String[][] P_PLATES = {
|
|
||||||
{"粤A12345", "待入场", "#12", "88"},
|
|
||||||
{"闽D99887", "作业中", "#07", "142"},
|
|
||||||
{"粤B66220", "已离园", "#29", "201"}
|
|
||||||
};
|
|
||||||
static final int P_ENT_OT = 42;
|
|
||||||
static final int P_OT_CNT = 28;
|
|
||||||
static final int P_PL_OT = 88;
|
|
||||||
static final double P_AVG_PL = 3.8;
|
|
||||||
static final int P_YD_OT = 91;
|
|
||||||
static final double P_AVG_YD = 5.2;
|
|
||||||
static final int P_TOT_PL = 58;
|
|
||||||
static final int P_OCC = 62;
|
|
||||||
static final int P_OP = 31;
|
|
||||||
static final int P_TASKS = 418;
|
|
||||||
static final int P_RESV = 2_850;
|
|
||||||
static final int P_NC = 920;
|
|
||||||
static final int P_OPV = 1_180;
|
|
||||||
static final int P_DONE = 1_420;
|
|
||||||
static final String[] P_MO_LABELS = {"5月", "6月", "7月"};
|
|
||||||
static final double[] P_YD_D = {12, 16, 19};
|
|
||||||
static final double[] P_PL_D = {19, 21, 18};
|
|
||||||
static final int P_MT_TOT = 1_820;
|
|
||||||
static final int P_MT_YOY = 8;
|
|
||||||
static final double P_MT_AVG = 5.1;
|
|
||||||
static final int P_MT_AVG_YOY = -3;
|
|
||||||
static final int P_MT_CR = 97;
|
|
||||||
static final int P_MT_CR_YOY = 2;
|
|
||||||
static final String[] P_LOAD_T = {"8时", "10时", "14时"};
|
|
||||||
static final int[] P_LOAD_C = {45, 120, 156};
|
|
||||||
static final String[] P_AL_D = {"1日", "2日", "3日"};
|
|
||||||
static final int[] P_AL_C = {6, 9, 4};
|
|
||||||
static final int P_TT_TOT = 5_100;
|
|
||||||
static final String[] P_TT_TYPES = {"干线发车", "城配到仓", "跨境保税"};
|
|
||||||
static final int[] P_TT_CNT = {2_100, 1_800, 1_200};
|
|
||||||
static final int P_AL_TOT = 9;
|
|
||||||
static final int P_AL_H = 8;
|
|
||||||
static final String[] P_DIST_T = {"仓储-温湿度", "月台-停留超时", "园区-证件异常"};
|
|
||||||
static final int[] P_DIST_C = {120, 95, 77};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biTransportOperationZone.repository.mapper;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiReportSnapshotMapperSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
|
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 运输运营专区：取 NGWL_TEST_BI.BI_TRANSPORT_OPERATION_ZONE_SNAPSHOT 最新 PAYLOAD_JSON 并解析。
|
|
||||||
*/
|
|
||||||
public interface BiTransportOperationZoneReportMapper {
|
|
||||||
|
|
||||||
String selectLatestPayloadJson(@Param("organizationName") String organizationName);
|
|
||||||
|
|
||||||
default TransportOperationZoneVO loadTransportOperationZone(String organizationName) {
|
|
||||||
return BiReportSnapshotMapperSupport.parsePayload(
|
|
||||||
selectLatestPayloadJson(organizationName),
|
|
||||||
TransportOperationZoneVO.class,
|
|
||||||
BiReportSnapshotMapperSupport::emptyTransportOperationZone,
|
|
||||||
"运输运营专区");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-25
@@ -1,25 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biTransportOperationZone.service;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biTransportOperationZone.repository.mapper.BiTransportOperationZoneReportMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 南光物流业务经营分析 · 运输运营专区
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
public class BiTransportOperationZoneReportService {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BiTransportOperationZoneReportMapper biTransportOperationZoneReportMapper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param organizationName 企业运营/组织名称（模糊匹配），为空时取全表最新一条
|
|
||||||
*/
|
|
||||||
public TransportOperationZoneVO loadTransportOperationZone(String organizationName) {
|
|
||||||
return biTransportOperationZoneReportMapper.loadTransportOperationZone(StringUtils.trimToNull(organizationName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-204
@@ -1,204 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biTransportOperationZone.support;
|
|
||||||
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.*;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 运输运营专区快照演示数据（对齐大屏示例 JSON；后续可改为真实聚合）。
|
|
||||||
*/
|
|
||||||
public final class TransportOperationZoneDemoData {
|
|
||||||
|
|
||||||
private static final DateTimeFormatter UPDATE_TIME_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
||||||
|
|
||||||
private TransportOperationZoneDemoData() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TransportOperationZoneVO build() {
|
|
||||||
List<TrOrderTypeMonthItemVO> orderTypeData = Arrays.asList(
|
|
||||||
TrOrderTypeMonthItemVO.builder().month("1月").crossBorder(30).domestic(25).build(),
|
|
||||||
TrOrderTypeMonthItemVO.builder().month("2月").crossBorder(40).domestic(35).build(),
|
|
||||||
TrOrderTypeMonthItemVO.builder().month("3月").crossBorder(20).domestic(30).build(),
|
|
||||||
TrOrderTypeMonthItemVO.builder().month("4月").crossBorder(35).domestic(40).build(),
|
|
||||||
TrOrderTypeMonthItemVO.builder().month("5月").crossBorder(50).domestic(45).build(),
|
|
||||||
TrOrderTypeMonthItemVO.builder().month("6月").crossBorder(60).domestic(55).build(),
|
|
||||||
TrOrderTypeMonthItemVO.builder().month("7月").crossBorder(70).domestic(65).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrMonthValuePointVO> tripTrend = Arrays.asList(
|
|
||||||
point("1月", 120), point("2月", 150), point("3月", 220),
|
|
||||||
point("4月", 100), point("5月", 140), point("6月", 180)
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrMonthValuePointVO> orderTrend = Arrays.asList(
|
|
||||||
point("1月", 100), point("2月", 140), point("3月", 230),
|
|
||||||
point("4月", 100), point("5月", 140), point("6月", 190)
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrMonthValuePointVO> volumeTrend = Arrays.asList(
|
|
||||||
point("1月", 95), point("2月", 90), point("3月", 80),
|
|
||||||
point("4月", 65), point("5月", 92), point("6月", 88)
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrMonthValuePointVO> onTimeRate = Arrays.asList(
|
|
||||||
point("1月", 98), point("2月", 96), point("3月", 85),
|
|
||||||
point("4月", 70), point("5月", 92), point("6月", 90)
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrMonthValuePointVO> vehicleUtil = Arrays.asList(
|
|
||||||
point("1月", 600), point("2月", 460), point("3月", 390),
|
|
||||||
point("4月", 470), point("5月", 450), point("6月", 620)
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrEnterpriseRowVO> enterpriseList = Arrays.asList(
|
|
||||||
row("NO.1", "通宇", "268.25万", "2400单", 95),
|
|
||||||
row("NO.2", "南岐", "258.15万", "1800单", 98),
|
|
||||||
row("NO.3", "谷丰", "242.32万", "1200单", 13),
|
|
||||||
row("NO.4", "仓码", "231.54万", "800单", 12),
|
|
||||||
row("NO.5", "横琴", "220.90万", "567单", 15)
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrCargoCategoryItemVO> cargoItems = Arrays.asList(
|
|
||||||
TrCargoCategoryItemVO.builder().name("危化").value(25).color("green").build(),
|
|
||||||
TrCargoCategoryItemVO.builder().name("普货").value(25).color("blue").build(),
|
|
||||||
TrCargoCategoryItemVO.builder().name("冻品").value(50).color("orange").build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<TrCargoTypeDetailVO> cargoTypeDetails = Arrays.asList(
|
|
||||||
TrCargoTypeDetailVO.builder().typeCode("2").name("第2类 气体").percentage("65%").color("#1890FF").build(),
|
|
||||||
TrCargoTypeDetailVO.builder().typeCode("3").name("第3类 易燃液体").percentage("25%").color("#52C41A").build(),
|
|
||||||
TrCargoTypeDetailVO.builder().typeCode("8").name("第8类 腐蚀性物质").percentage("15%").color("#FAAD14").build()
|
|
||||||
);
|
|
||||||
|
|
||||||
TrMapNodeVO mapNode = TrMapNodeVO.builder()
|
|
||||||
.id(1L)
|
|
||||||
.name("通宇作业车辆")
|
|
||||||
.location(Arrays.asList(113.55, 22.25))
|
|
||||||
.status("working")
|
|
||||||
.detail(TrMapNodeDetailVO.builder()
|
|
||||||
.title("作业详情")
|
|
||||||
.licensePlate("粤A88888")
|
|
||||||
.businessUnit("通宇")
|
|
||||||
.loadingPlace("珠海")
|
|
||||||
.destination("澳门")
|
|
||||||
.currentLocation("珠海市")
|
|
||||||
.updateTime("2026年4月15日 17:52")
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return TransportOperationZoneVO.builder()
|
|
||||||
.updateTime(LocalDateTime.now().format(UPDATE_TIME_FMT))
|
|
||||||
.dashboardTitle("南光物流业务经营分析")
|
|
||||||
.activeTab("运输运营专区")
|
|
||||||
.orderStatistics(TrOrderStatisticsVO.builder()
|
|
||||||
.title("订单统计")
|
|
||||||
.total(4361L)
|
|
||||||
.trend("+12.5%")
|
|
||||||
.build())
|
|
||||||
.transportStats(TrTransportStatsVO.builder()
|
|
||||||
.title("运输统计")
|
|
||||||
.tripCount(240)
|
|
||||||
.volume(2.6)
|
|
||||||
.volumeUnit("万吨")
|
|
||||||
.build())
|
|
||||||
.orderTypeChart(TrOrderTypeChartVO.builder()
|
|
||||||
.title("订单类型")
|
|
||||||
.type("area")
|
|
||||||
.data(orderTypeData)
|
|
||||||
.build())
|
|
||||||
.tripCountTrend(chart("车次趋势", "line", null, tripTrend))
|
|
||||||
.orderTrend(chart("订单趋势", "area", "单", orderTrend))
|
|
||||||
.volumeTrend(chart("货量趋势", "area", "%", volumeTrend))
|
|
||||||
.map(TrVehicleMapVO.builder()
|
|
||||||
.title("车辆实时监控")
|
|
||||||
.legend(TrMapLegendVO.builder().idle(80).working(200).build())
|
|
||||||
.nodes(Collections.singletonList(mapNode))
|
|
||||||
.build())
|
|
||||||
.enterpriseOperation(TrEnterpriseOperationVO.builder()
|
|
||||||
.title("企业运营")
|
|
||||||
.columns(Arrays.asList("序号", "企业名称", "货运量", "处理单量", "准时配送率"))
|
|
||||||
.list(enterpriseList)
|
|
||||||
.build())
|
|
||||||
.capacityStatus(TrCapacityStatusVO.builder()
|
|
||||||
.title("运力情况")
|
|
||||||
.staff(capacityCount(718, 0, 0))
|
|
||||||
.vehicles(capacityCount(507, 0, 0))
|
|
||||||
.build())
|
|
||||||
.cargoCategory(TrCargoCategoryVO.builder()
|
|
||||||
.title("货物品类")
|
|
||||||
.totalOrders("1000单")
|
|
||||||
.data(cargoItems)
|
|
||||||
.build())
|
|
||||||
.onTimeRate(chart("准时配送率", "line", "%", onTimeRate))
|
|
||||||
.vehicleUtilization(TrBarChartVO.builder()
|
|
||||||
.title("出车利用率")
|
|
||||||
.unit("车次/辆")
|
|
||||||
.data(vehicleUtil)
|
|
||||||
.build())
|
|
||||||
.transportSummary(TrTransportSummaryVO.builder()
|
|
||||||
.title("运输统计")
|
|
||||||
.safeMileage("240万公里")
|
|
||||||
.avgDeliveryTime("平均4小时送达")
|
|
||||||
.build())
|
|
||||||
.capacityStats(TrCapacityStatsVO.builder()
|
|
||||||
.vehicles(capacityStatItem(280, "辆", "车辆"))
|
|
||||||
.drivers(capacityStatItem(360, "人", "驾驶员"))
|
|
||||||
.escorts(capacityStatItem(56, "人", "押运员"))
|
|
||||||
.build())
|
|
||||||
.cargoTypeDistribution(TrCargoTypeDistributionVO.builder()
|
|
||||||
.title("货物类型分布")
|
|
||||||
.totalOrders(1000)
|
|
||||||
.totalUnit("单")
|
|
||||||
.details(cargoTypeDetails)
|
|
||||||
.build())
|
|
||||||
.freshOrderStats(sampleBrandOrderStats())
|
|
||||||
.vitasoyOrderStats(sampleBrandOrderStats())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrBrandOrderStatsVO sampleBrandOrderStats() {
|
|
||||||
return TrBrandOrderStatsVO.builder()
|
|
||||||
.plannedDelivery(orderStatMetric(2135, "单", "计划配送"))
|
|
||||||
.orderQuantity(orderStatMetric(228, "万吨", "订单数量"))
|
|
||||||
.vehiclesInTransit(orderStatMetric(84, "辆", "在途车辆"))
|
|
||||||
.completedDelivery(TrOrderStatTextMetricVO.builder()
|
|
||||||
.value("22.8%").unit("").label("完成配送").build())
|
|
||||||
.overtimeDelivery(orderStatMetric(228, "单", "超时配送"))
|
|
||||||
.onTimeRate(TrOrderStatRateMetricVO.builder()
|
|
||||||
.value("85%").trend("+30%").label("准时配送率").build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrOrderStatMetricVO orderStatMetric(int value, String unit, String label) {
|
|
||||||
return TrOrderStatMetricVO.builder().value(value).unit(unit).label(label).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrCapacityStatItemVO capacityStatItem(int value, String unit, String label) {
|
|
||||||
return TrCapacityStatItemVO.builder().value(value).unit(unit).label(label).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrMonthValuePointVO point(String month, int value) {
|
|
||||||
return TrMonthValuePointVO.builder().month(month).value(value).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrTypedChartVO chart(String title, String type, String unit, List<TrMonthValuePointVO> data) {
|
|
||||||
return TrTypedChartVO.builder().title(title).type(type).unit(unit).data(data).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrCapacityCountVO capacityCount(int total, int todayNew, int yesterdayNew) {
|
|
||||||
return TrCapacityCountVO.builder()
|
|
||||||
.total(total).todayNew(todayNew).yesterdayNew(yesterdayNew).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrEnterpriseRowVO row(String rank, String name, String volume,
|
|
||||||
String processedOrders, int onTimeRate) {
|
|
||||||
return TrEnterpriseRowVO.builder()
|
|
||||||
.rank(rank).name(name).volume(volume)
|
|
||||||
.processedOrders(processedOrders).onTimeRate(onTimeRate)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biWarehouseOperationZone.repository.mapper;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiReportSnapshotMapperSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
|
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 仓储运营专区：取 NGWL_TEST_BI.BI_WAREHOUSE_OPERATION_ZONE_SNAPSHOT 最新 PAYLOAD_JSON 并解析。
|
|
||||||
*/
|
|
||||||
public interface BiWarehouseOperationZoneReportMapper {
|
|
||||||
|
|
||||||
String selectLatestPayloadJson(@Param("organizationName") String organizationName);
|
|
||||||
|
|
||||||
default WarehouseOperationZoneVO loadWarehouseOperationZone(String organizationName) {
|
|
||||||
return BiReportSnapshotMapperSupport.parsePayload(
|
|
||||||
selectLatestPayloadJson(organizationName),
|
|
||||||
WarehouseOperationZoneVO.class,
|
|
||||||
BiReportSnapshotMapperSupport::emptyWarehouseOperationZone,
|
|
||||||
"仓储运营专区");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-25
@@ -1,25 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biWarehouseOperationZone.service;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biWarehouseOperationZone.repository.mapper.BiWarehouseOperationZoneReportMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 南光物流业务经营分析 · 仓储运营专区
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
public class BiWarehouseOperationZoneReportService {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BiWarehouseOperationZoneReportMapper biWarehouseOperationZoneReportMapper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param organizationName 企业运营/组织名称（模糊匹配），为空时取全表最新一条
|
|
||||||
*/
|
|
||||||
public WarehouseOperationZoneVO loadWarehouseOperationZone(String organizationName) {
|
|
||||||
return biWarehouseOperationZoneReportMapper.loadWarehouseOperationZone(StringUtils.trimToNull(organizationName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-210
@@ -1,210 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biWarehouseOperationZone.support;
|
|
||||||
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.*;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 仓储运营专区快照演示数据（对齐大屏示例 JSON；后续可改为真实聚合）。
|
|
||||||
*/
|
|
||||||
public final class WarehouseOperationZoneDemoData {
|
|
||||||
|
|
||||||
private WarehouseOperationZoneDemoData() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static WarehouseOperationZoneVO build() {
|
|
||||||
List<WhThroughputMonthItemVO> throughputTrend = Arrays.asList(
|
|
||||||
WhThroughputMonthItemVO.builder().month("11月").value(10).build(),
|
|
||||||
WhThroughputMonthItemVO.builder().month("12月").value(14).build(),
|
|
||||||
WhThroughputMonthItemVO.builder().month("1月").value(22).build(),
|
|
||||||
WhThroughputMonthItemVO.builder().month("2月").value(21).build(),
|
|
||||||
WhThroughputMonthItemVO.builder().month("3月").value(13).build(),
|
|
||||||
WhThroughputMonthItemVO.builder().month("4月").value(16).build(),
|
|
||||||
WhThroughputMonthItemVO.builder().month("5月").value(8).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<WhAreaDistributionDetailVO> areaDetails = Arrays.asList(
|
|
||||||
WhAreaDistributionDetailVO.builder().name("普通仓出租面积").value(9400).unit("m²").build(),
|
|
||||||
WhAreaDistributionDetailVO.builder().name("自动化立库出租面积").value(9400).unit("m²").build(),
|
|
||||||
WhAreaDistributionDetailVO.builder().name("闲置面积").value(9400).unit("m²").build(),
|
|
||||||
WhAreaDistributionDetailVO.builder().name("冷冻仓出租面积").value(9400).unit("m²").build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<WhMonthRatePointVO> capTrendData = Arrays.asList(
|
|
||||||
WhMonthRatePointVO.builder().month("1月").rate(20).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("2月").rate(30).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("3月").rate(55).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("4月").rate(40).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("5月").rate(45).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("6月").rate(60).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("7月").rate(50).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<WhMonthRatePointVO> orderTrend = Arrays.asList(
|
|
||||||
WhMonthRatePointVO.builder().month("1月").rate(100).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("2月").rate(90).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("3月").rate(75).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("4月").rate(70).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("5月").rate(95).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("6月").rate(85).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<WhMonthRatePointVO> turnoverData = Arrays.asList(
|
|
||||||
WhMonthRatePointVO.builder().month("11月").rate(10).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("12月").rate(15).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("1月").rate(22).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("2月").rate(20).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("3月").rate(12).build(),
|
|
||||||
WhMonthRatePointVO.builder().month("4月").rate(16).build()
|
|
||||||
);
|
|
||||||
|
|
||||||
List<WhServiceCapacityRowVO> serviceCapacity = Arrays.asList(
|
|
||||||
WhServiceCapacityRowVO.builder().rank(1).name("君华仓").totalArea("1.2万m²").processed("2,400单").throughput("2.2万吨").build(),
|
|
||||||
WhServiceCapacityRowVO.builder().rank(2).name("通宇仓").totalArea("1.2万m²").processed("1,800单").throughput("1.1万吨").build(),
|
|
||||||
WhServiceCapacityRowVO.builder().rank(3).name("横琴仓").totalArea("1.2万m²").processed("1,200单").throughput("1.5万吨").build(),
|
|
||||||
WhServiceCapacityRowVO.builder().rank(4).name("新南仓").totalArea("1.2万m²").processed("800单").throughput("2.1万吨").build(),
|
|
||||||
WhServiceCapacityRowVO.builder().rank(5).name("谷丰仓").totalArea("1.2万m²").processed("567单").throughput("1.8万吨").build()
|
|
||||||
);
|
|
||||||
|
|
||||||
return WarehouseOperationZoneVO.builder()
|
|
||||||
.warehouseName("新南仓")
|
|
||||||
.updateTime("2026-04-16 18:41:00")
|
|
||||||
.orderSummary(WhOrderSummaryVO.builder()
|
|
||||||
.totalCount("03600")
|
|
||||||
.inboundOrders(orderSummaryItem("入库单", 2298))
|
|
||||||
.outboundOrders(orderSummaryItem("出库单", 1129))
|
|
||||||
.operationOrders(orderSummaryItem("作业单", 345))
|
|
||||||
.build())
|
|
||||||
.coldStorageStats(WhColdStorageStatsVO.builder()
|
|
||||||
.revenueShare(coldMetric("64.8%", "+30%"))
|
|
||||||
.utilizationRate(coldMetric("28.6%", "+30%"))
|
|
||||||
.damageRate(coldMetric("1.6%", "+30%"))
|
|
||||||
.build())
|
|
||||||
.temperatureExceptions(sampleTemperatureExceptions())
|
|
||||||
.storageOverview(WhStorageOverviewVO.builder()
|
|
||||||
.title("仓储面积")
|
|
||||||
.value(10)
|
|
||||||
.unit("万m²")
|
|
||||||
.subText("覆盖仓库数8个")
|
|
||||||
.build())
|
|
||||||
.operationStats(WhOperationStatsVO.builder()
|
|
||||||
.title("年吞吐量")
|
|
||||||
.value(26)
|
|
||||||
.unit("万吨")
|
|
||||||
.growthRate("8.5%")
|
|
||||||
.trend("up")
|
|
||||||
.build())
|
|
||||||
.businessPlanning(WhBusinessPlanningVO.builder()
|
|
||||||
.generalWarehouse(43000)
|
|
||||||
.coldStorage(15000)
|
|
||||||
.foodProcessing(11000)
|
|
||||||
.automatedStorage(5200)
|
|
||||||
.build())
|
|
||||||
.throughputTrend(throughputTrend)
|
|
||||||
.areaDistribution(WhAreaDistributionVO.builder()
|
|
||||||
.utilizationRate("85%")
|
|
||||||
.details(areaDetails)
|
|
||||||
.build())
|
|
||||||
.capacityUtilizationTrend(WhCapacityUtilizationTrendVO.builder()
|
|
||||||
.peakLabel("60%")
|
|
||||||
.data(capTrendData)
|
|
||||||
.build())
|
|
||||||
.orderStatistics(WhOrderStatisticsVO.builder()
|
|
||||||
.annualOrders(525440L)
|
|
||||||
.quarterlyOrders(225120L)
|
|
||||||
.monthlyOrders(23560L)
|
|
||||||
.build())
|
|
||||||
.serviceStatistics(WhServiceStatisticsVO.builder()
|
|
||||||
.clients(582)
|
|
||||||
.coverage("覆盖港珠澳")
|
|
||||||
.onTimeRate("98.2%")
|
|
||||||
.rateChange("0.4%")
|
|
||||||
.build())
|
|
||||||
.orderTrend(orderTrend)
|
|
||||||
.turnoverRateTrend(WhTurnoverRateTrendVO.builder()
|
|
||||||
.currentMonth("3次")
|
|
||||||
.annual("4次")
|
|
||||||
.data(turnoverData)
|
|
||||||
.build())
|
|
||||||
.serviceCapacity(serviceCapacity)
|
|
||||||
.realTimeAnalysis(WhRealTimeAnalysisVO.builder()
|
|
||||||
.utilizationRate(WhRealTimeGaugeVO.builder()
|
|
||||||
.value("50.8%")
|
|
||||||
.comparison("3.4%")
|
|
||||||
.trend("up")
|
|
||||||
.build())
|
|
||||||
.rentalRate(WhRealTimeGaugeVO.builder()
|
|
||||||
.value("70.8%")
|
|
||||||
.comparison("3.4%")
|
|
||||||
.trend("up")
|
|
||||||
.build())
|
|
||||||
.build())
|
|
||||||
.map(WhWarehouseMapVO.builder()
|
|
||||||
.legend("仓库")
|
|
||||||
.nodes(Arrays.asList(
|
|
||||||
mapNode(1L, "君华仓", 113.52, 22.30,
|
|
||||||
"君华保税仓", "12000m²", 520, 2400, "82%", "36.5%"),
|
|
||||||
mapNode(2L, "通宇仓", 113.55, 22.25,
|
|
||||||
"通宇保税仓", "2000m²", 668, 237, "85%", "37.1%"),
|
|
||||||
mapNode(3L, "横琴仓", 113.54, 22.12,
|
|
||||||
"横琴保税仓", "3500m²", 445, 1200, "78%", "42.0%"),
|
|
||||||
mapNode(4L, "新南仓", 113.58, 22.20,
|
|
||||||
"新南保税仓", "2800m²", 390, 800, "80%", "35.8%"),
|
|
||||||
mapNode(5L, "谷丰仓", 113.48, 22.22,
|
|
||||||
"谷丰保税仓", "4500m²", 512, 567, "76%", "33.2%")
|
|
||||||
))
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static WhOrderSummaryCountItemVO orderSummaryItem(String label, int value) {
|
|
||||||
return WhOrderSummaryCountItemVO.builder().label(label).value(value).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static WhColdStorageMetricVO coldMetric(String value, String trend) {
|
|
||||||
return WhColdStorageMetricVO.builder().value(value).trend(trend).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<WhTemperatureExceptionVO> sampleTemperatureExceptions() {
|
|
||||||
return Arrays.asList(
|
|
||||||
tempException(1, "I级"),
|
|
||||||
tempException(2, "II级"),
|
|
||||||
tempException(3, "II级"),
|
|
||||||
tempException(4, "II级"),
|
|
||||||
tempException(5, "IV级"),
|
|
||||||
tempException(6, "IV级"),
|
|
||||||
tempException(7, "IV级")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static WhTemperatureExceptionVO tempException(int rank, String level) {
|
|
||||||
return WhTemperatureExceptionVO.builder()
|
|
||||||
.rank(rank)
|
|
||||||
.level(level)
|
|
||||||
.area("A1区")
|
|
||||||
.deviceId("01020304")
|
|
||||||
.temperature("-4°C")
|
|
||||||
.duration("持续0小时12分钟")
|
|
||||||
.occurTime("04-16 18:41")
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static WhMapNodeVO mapNode(long id, String name, double lng, double lat,
|
|
||||||
String warehouseName, String totalArea, int totalSku,
|
|
||||||
int todayOrders, String utilizationRate, String rentalRate) {
|
|
||||||
return WhMapNodeVO.builder()
|
|
||||||
.id(id)
|
|
||||||
.name(name)
|
|
||||||
.location(Arrays.asList(lng, lat))
|
|
||||||
.detail(WhMapPopupVO.builder()
|
|
||||||
.warehouseName(warehouseName)
|
|
||||||
.totalArea(totalArea)
|
|
||||||
.totalSku(totalSku)
|
|
||||||
.todayOrders(todayOrders)
|
|
||||||
.utilizationRate(utilizationRate)
|
|
||||||
.rentalRate(rentalRate)
|
|
||||||
.build())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biWarehouseTransport.repository.mapper;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biReport.support.BiReportSnapshotMapperSupport;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.WarehouseTransportSituationVO;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 仓储运输：SQL 见 BiWarehouseTransportReportMapper.xml；取数与组装均在 Mapper 层完成。
|
|
||||||
*/
|
|
||||||
public interface BiWarehouseTransportReportMapper {
|
|
||||||
|
|
||||||
String selectLatestPayloadJson();
|
|
||||||
|
|
||||||
default WarehouseTransportSituationVO loadLatestWarehouseTransport() {
|
|
||||||
return BiReportSnapshotMapperSupport.parsePayload(
|
|
||||||
selectLatestPayloadJson(),
|
|
||||||
WarehouseTransportSituationVO.class,
|
|
||||||
BiReportSnapshotMapperSupport::emptyWarehouseTransportSituation,
|
|
||||||
"仓储运输");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
package com.mhd.bi.domain.biWarehouseTransport.service;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biWarehouseTransport.repository.mapper.BiWarehouseTransportReportMapper;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.WarehouseTransportSituationVO;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class BiWarehouseTransportReportService {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BiWarehouseTransportReportMapper biWarehouseTransportReportMapper;
|
|
||||||
|
|
||||||
public WarehouseTransportSituationVO loadLatestWarehouseTransport() {
|
|
||||||
return biWarehouseTransportReportMapper.loadLatestWarehouseTransport();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package com.mhd.bi.domain.testTable.entity;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.mhd.common.core.annotation.Excel;
|
|
||||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class TestTable implements Serializable {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
/** 车队id */
|
|
||||||
@ApiModelProperty("车队id")
|
|
||||||
@TableId(type = IdType.AUTO)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@ApiModelProperty(name = "txt")
|
|
||||||
private String txt;
|
|
||||||
|
|
||||||
}
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
package com.mhd.bi.domain.testTable.repository.facade;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
|
||||||
import com.mhd.bi.domain.testTable.entity.TestTable;
|
|
||||||
|
|
||||||
public interface TestTableService extends IService<TestTable>
|
|
||||||
{
|
|
||||||
}
|
|
||||||
-16
@@ -1,16 +0,0 @@
|
|||||||
package com.mhd.bi.domain.testTable.repository.mapper;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|
||||||
import com.mhd.bi.domain.testTable.entity.TestTable;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 车队Mapper接口
|
|
||||||
*
|
|
||||||
* @author zihao
|
|
||||||
* @date 2023-05-24
|
|
||||||
*/
|
|
||||||
public interface TestTableMapper extends BaseMapper<TestTable>
|
|
||||||
{
|
|
||||||
}
|
|
||||||
-15
@@ -1,15 +0,0 @@
|
|||||||
package com.mhd.bi.domain.testTable.repository.persistence;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
||||||
import com.mhd.bi.domain.testTable.entity.TestTable;
|
|
||||||
import com.mhd.bi.domain.testTable.repository.facade.TestTableService;
|
|
||||||
import com.mhd.bi.domain.testTable.repository.mapper.TestTableMapper;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class TestTableServiceImpl extends ServiceImpl<TestTableMapper, TestTable> implements TestTableService {
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,147 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport;
|
|
||||||
|
|
||||||
import com.mhd.bi.domain.biSnapshotSync.service.BiReportSnapshotSyncService;
|
|
||||||
import com.mhd.bi.domain.biComprehensive.service.BiComprehensiveReportService;
|
|
||||||
import com.mhd.bi.domain.biPlatformSurveillance.service.BiPlatformSurveillanceReportService;
|
|
||||||
import com.mhd.bi.domain.biOverallOperation.service.BiOverallOperationReportService;
|
|
||||||
import com.mhd.bi.domain.biHkMacaoServiceZone.service.BiHkMacaoServiceZoneReportService;
|
|
||||||
import com.mhd.bi.domain.biTransportOperationZone.service.BiTransportOperationZoneReportService;
|
|
||||||
import com.mhd.bi.domain.biWarehouseOperationZone.service.BiWarehouseOperationZoneReportService;
|
|
||||||
import com.mhd.bi.domain.biWarehouseTransport.service.BiWarehouseTransportReportService;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.dto.BiApiResult;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.ComprehensiveSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.WarehouseTransportSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallOperationSituationVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
|
|
||||||
import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
|
|
||||||
import com.mhd.common.core.web.controller.BaseController;
|
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import io.swagger.annotations.ApiParam;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.bind.annotation.CrossOrigin;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BI 报表接口
|
|
||||||
*/
|
|
||||||
@Api(tags = "BI报表", description = "须在请求头携带 X-BI-Access-Token，与配置 mhd.bi.access-token 一致")
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/biReport")
|
|
||||||
@CrossOrigin
|
|
||||||
public class BiReportApi extends BaseController {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiComprehensiveReportService biComprehensiveReportService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiWarehouseTransportReportService biWarehouseTransportReportService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiPlatformSurveillanceReportService biPlatformSurveillanceReportService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiOverallOperationReportService biOverallOperationReportService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiWarehouseOperationZoneReportService biWarehouseOperationZoneReportService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiTransportOperationZoneReportService biTransportOperationZoneReportService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiHkMacaoServiceZoneReportService biHkMacaoServiceZoneReportService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private BiReportSnapshotSyncService biReportSnapshotSyncService;
|
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation(value = "手动触发快照同步", notes = "立即写入各 BI 快照表（综合、仓储运输、月台监测、总体运营、仓储运营专区、运输运营专区、港澳服务专区）；须带 X-BI-Access-Token")
|
|
||||||
@PostMapping("/snapshotSync/run")
|
|
||||||
public BiApiResult<Void> runSnapshotSyncOnce() {
|
|
||||||
biReportSnapshotSyncService.syncAllSnapshots();
|
|
||||||
return BiApiResult.ok(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 综合态势指标查询（按照 del_flag=1，按 create_time 最新一条）
|
|
||||||
*/
|
|
||||||
@ApiOperation(value = "综合态势指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条")
|
|
||||||
@GetMapping("/comprehensive")
|
|
||||||
public BiApiResult<ComprehensiveSituationVO> comprehensive() {
|
|
||||||
ComprehensiveSituationVO data = biComprehensiveReportService.loadLatestComprehensive();
|
|
||||||
return BiApiResult.ok(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 仓储运输指标查询（按照 del_flag=1，按 create_time 最新一条）
|
|
||||||
*/
|
|
||||||
@ApiOperation(value = "仓储运输指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条")
|
|
||||||
@GetMapping("/warehouseTransport")
|
|
||||||
public BiApiResult<WarehouseTransportSituationVO> warehouseTransport() {
|
|
||||||
WarehouseTransportSituationVO data = biWarehouseTransportReportService.loadLatestWarehouseTransport();
|
|
||||||
return BiApiResult.ok(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 月台监测指标查询（按照 del_flag=1，按 create_time 最新一条）
|
|
||||||
*/
|
|
||||||
@ApiOperation(value = "月台监测指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条快照")
|
|
||||||
@GetMapping("/platformSurveillance")
|
|
||||||
public BiApiResult<PlatformSurveillanceVO> platformSurveillance() {
|
|
||||||
PlatformSurveillanceVO data = biPlatformSurveillanceReportService.loadLatestPlatformSurveillance();
|
|
||||||
return BiApiResult.ok(data);
|
|
||||||
}
|
|
||||||
//园区物流大屏接口----------------------------------------------------------------------
|
|
||||||
/**
|
|
||||||
* 总体运营态势
|
|
||||||
*/
|
|
||||||
@ApiOperation(value = "总体运营态势查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条整包 JSON 解析结果")
|
|
||||||
@GetMapping("/overallOperation")
|
|
||||||
public BiApiResult<OverallOperationSituationVO> overallOperation() {
|
|
||||||
OverallOperationSituationVO data = biOverallOperationReportService.loadLatestOverallOperation();
|
|
||||||
return BiApiResult.ok(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 仓储运营专区（大屏「仓储运营专区」Tab）
|
|
||||||
*/
|
|
||||||
@ApiOperation(value = "仓储运营专区查询", notes = "未传 organizationName 时返回全表最新一条；")
|
|
||||||
@GetMapping("/warehouseOperationZone")
|
|
||||||
public BiApiResult<WarehouseOperationZoneVO> warehouseOperationZone(
|
|
||||||
@ApiParam(value = "企业运营/组织名称")
|
|
||||||
@RequestParam(value = "organizationName", required = false) String organizationName) {
|
|
||||||
WarehouseOperationZoneVO data = biWarehouseOperationZoneReportService.loadWarehouseOperationZone(organizationName);
|
|
||||||
return BiApiResult.ok(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 运输运营专区（大屏「运输运营专区」Tab）
|
|
||||||
*/
|
|
||||||
@ApiOperation(value = "运输运营专区查询", notes = "未传 organizationName 时返回全表最新一条；传入时双向模糊匹配 ORGANIZATION_NAME（库名包含关键词，或关键词包含库名）")
|
|
||||||
@GetMapping("/transportOperationZone")
|
|
||||||
public BiApiResult<TransportOperationZoneVO> transportOperationZone(
|
|
||||||
@ApiParam(value = "企业运营/组织名称，与快照表 ORGANIZATION_NAME 双向模糊匹配")
|
|
||||||
@RequestParam(value = "organizationName", required = false) String organizationName) {
|
|
||||||
TransportOperationZoneVO data = biTransportOperationZoneReportService.loadTransportOperationZone(organizationName);
|
|
||||||
return BiApiResult.ok(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 港澳服务专区（大屏「港澳服务专区」）
|
|
||||||
*/
|
|
||||||
@ApiOperation(value = "港澳服务专区查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条整包 JSON 解析结果")
|
|
||||||
@GetMapping("/hkMacaoServiceZone")
|
|
||||||
public BiApiResult<HkMacaoServiceZoneVO> hkMacaoServiceZone() {
|
|
||||||
HkMacaoServiceZoneVO data = biHkMacaoServiceZoneReportService.loadLatestHkMacaoServiceZone();
|
|
||||||
return BiApiResult.ok(data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BI 接口统一响应（与前端示例：code + msg + data）
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class BiApiResult<T> {
|
|
||||||
|
|
||||||
private int code = 200;
|
|
||||||
|
|
||||||
private String message = "操作成功";
|
|
||||||
|
|
||||||
private T data;
|
|
||||||
|
|
||||||
public static <T> BiApiResult<T> ok(T data) {
|
|
||||||
return new BiApiResult<>(200, "操作成功", data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-39
@@ -1,39 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 综合态势指标
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("综合态势指标")
|
|
||||||
public class ComprehensiveSituationVO {
|
|
||||||
|
|
||||||
@ApiModelProperty("增值服务收入，单位：元人民币")
|
|
||||||
private Long valueAddedServiceIncome;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存周转率，单位：次")
|
|
||||||
private Integer inventoryTurnover;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输订单量，单位：单")
|
|
||||||
private Integer orderCount;
|
|
||||||
|
|
||||||
@ApiModelProperty("车辆利用率，单位：%")
|
|
||||||
private Double vehicleUtilizationRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("百公里油耗，单位：升")
|
|
||||||
private Integer fuelConsumptionPerHundredKm;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输收入趋势，单位：万元（近半年，按月正序）")
|
|
||||||
private List<Integer> incomeTrend;
|
|
||||||
}
|
|
||||||
-24
@@ -1,24 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("客户贡献排名（前5）")
|
|
||||||
public class CustomerContributionRankVO {
|
|
||||||
|
|
||||||
@ApiModelProperty("客户名称")
|
|
||||||
private List<String> customerName;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户金额，单位：万元")
|
|
||||||
private List<Integer> customerAmount;
|
|
||||||
}
|
|
||||||
-78
@@ -1,78 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("仓储运输指标")
|
|
||||||
public class WarehouseTransportSituationVO {
|
|
||||||
|
|
||||||
@ApiModelProperty("仓配衔接准时率，单位：%")
|
|
||||||
private Double warehouseDistributionOnTimeRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("本年度订单，单位：单")
|
|
||||||
private Long currentYearOrders;
|
|
||||||
|
|
||||||
@ApiModelProperty("本季度订单，单位：单")
|
|
||||||
private Integer currentQuarterOrders;
|
|
||||||
|
|
||||||
@ApiModelProperty("本月度订单，单位：单")
|
|
||||||
private Integer currentMonthOrders;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓库订单趋势，单位：单（近半年，按月正序）")
|
|
||||||
private List<Integer> warehouseOrderTrend;
|
|
||||||
|
|
||||||
@ApiModelProperty("吞吐量统计，单位：吨（近半年，按月正序）")
|
|
||||||
private List<Integer> throughput;
|
|
||||||
|
|
||||||
@ApiModelProperty("本月周转率，单位：次")
|
|
||||||
private Integer currentMonthTurnoverRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("本年周转率，单位：次")
|
|
||||||
private Integer currentYearTurnoverRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("库存周转率趋势，单位：次（近半年，按月正序）")
|
|
||||||
private List<Integer> inventoryTurnoverTrend;
|
|
||||||
|
|
||||||
@ApiModelProperty("总收入，单位：万元")
|
|
||||||
private Integer totalTransportIncome;
|
|
||||||
|
|
||||||
@ApiModelProperty("订单数量，单位：单")
|
|
||||||
private Integer orderCount;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输车次，单位：次")
|
|
||||||
private Integer transportTrips;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输货量，单位：万吨")
|
|
||||||
private Integer annualTransportVolume;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输订单总数，单位：单")
|
|
||||||
private Integer transportOrderTotal;
|
|
||||||
|
|
||||||
@ApiModelProperty("跨境订单，单位：单")
|
|
||||||
private Integer crossBorderTransportOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("国内订单，单位：单")
|
|
||||||
private Integer domesticTransportOrder;
|
|
||||||
|
|
||||||
@ApiModelProperty("运输车次趋势（近半年，按月正序）")
|
|
||||||
private List<Integer> transportTripsTrend;
|
|
||||||
|
|
||||||
@ApiModelProperty("出车利用率，单位：车次（近半年，按月正序）")
|
|
||||||
private List<Integer> vehicleUtilizationRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("仓配衔接准时率（近半年，按月正序），单位：%")
|
|
||||||
private List<Integer> warehouseDockSyncRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("客户贡献排名")
|
|
||||||
private CustomerContributionRankVO customerContributionRank;
|
|
||||||
}
|
|
||||||
-33
@@ -1,33 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("BI-港澳服务专区-服务客户统计")
|
|
||||||
public class HkClientServiceStatsVO {
|
|
||||||
|
|
||||||
@JsonProperty("hk_macao_clients")
|
|
||||||
@ApiModelProperty("港澳客户数")
|
|
||||||
private Integer hkMacaoClients;
|
|
||||||
|
|
||||||
@JsonProperty("client_ratio")
|
|
||||||
@ApiModelProperty("客户占比")
|
|
||||||
private String clientRatio;
|
|
||||||
|
|
||||||
@JsonProperty("warehouse_usage_area")
|
|
||||||
@ApiModelProperty("仓库使用面积")
|
|
||||||
private String warehouseUsageArea;
|
|
||||||
|
|
||||||
@JsonProperty("area_ratio")
|
|
||||||
@ApiModelProperty("面积占比")
|
|
||||||
private String areaRatio;
|
|
||||||
}
|
|
||||||
-29
@@ -1,29 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("BI-港澳服务专区-门到门时效")
|
|
||||||
public class HkDoorToDoorEfficiencyVO {
|
|
||||||
|
|
||||||
@JsonProperty("average_time")
|
|
||||||
@ApiModelProperty("平均时效")
|
|
||||||
private String averageTime;
|
|
||||||
|
|
||||||
@JsonProperty("fastest_time")
|
|
||||||
@ApiModelProperty("最快时效")
|
|
||||||
private String fastestTime;
|
|
||||||
|
|
||||||
@JsonProperty("mom_growth")
|
|
||||||
@ApiModelProperty("环比增幅")
|
|
||||||
private String momGrowth;
|
|
||||||
}
|
|
||||||
-33
@@ -1,33 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("BI-港澳服务专区-库存周转率趋势")
|
|
||||||
public class HkInventoryTurnoverTrendVO {
|
|
||||||
|
|
||||||
@JsonProperty("current_month_rate")
|
|
||||||
@ApiModelProperty("本月周转率")
|
|
||||||
private String currentMonthRate;
|
|
||||||
|
|
||||||
@JsonProperty("annual_rate")
|
|
||||||
@ApiModelProperty("年度周转率")
|
|
||||||
private String annualRate;
|
|
||||||
|
|
||||||
@ApiModelProperty("单位")
|
|
||||||
private String unit;
|
|
||||||
|
|
||||||
@ApiModelProperty("按月序列")
|
|
||||||
private List<HkMonthRatePointVO> data;
|
|
||||||
}
|
|
||||||
-74
@@ -1,74 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 港澳服务专区（整包 data 与快照 PAYLOAD_JSON 一致）
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("BI-港澳服务专区")
|
|
||||||
public class HkMacaoServiceZoneVO {
|
|
||||||
|
|
||||||
@JsonProperty("warehouse_order_stats")
|
|
||||||
@ApiModelProperty("仓库订单统计")
|
|
||||||
private HkOrderStatsVO warehouseOrderStats;
|
|
||||||
|
|
||||||
@JsonProperty("client_service_stats")
|
|
||||||
@ApiModelProperty("服务客户统计")
|
|
||||||
private HkClientServiceStatsVO clientServiceStats;
|
|
||||||
|
|
||||||
@JsonProperty("goods_source_stats")
|
|
||||||
@ApiModelProperty("货物品类来源")
|
|
||||||
private HkRingChartStatsVO goodsSourceStats;
|
|
||||||
|
|
||||||
@JsonProperty("cross_border_order_stats")
|
|
||||||
@ApiModelProperty("跨境订单统计")
|
|
||||||
private HkRingChartStatsVO crossBorderOrderStats;
|
|
||||||
|
|
||||||
@JsonProperty("warehouse_order_trend")
|
|
||||||
@ApiModelProperty("仓库订单趋势")
|
|
||||||
private List<HkOrderTrendMonthVO> warehouseOrderTrend;
|
|
||||||
|
|
||||||
@JsonProperty("inventory_turnover_trend")
|
|
||||||
@ApiModelProperty("库存周转率趋势")
|
|
||||||
private HkInventoryTurnoverTrendVO inventoryTurnoverTrend;
|
|
||||||
|
|
||||||
@JsonProperty("transport_order_stats")
|
|
||||||
@ApiModelProperty("运输订单统计")
|
|
||||||
private HkOrderStatsVO transportOrderStats;
|
|
||||||
|
|
||||||
@JsonProperty("door_to_door_efficiency")
|
|
||||||
@ApiModelProperty("门到门时效")
|
|
||||||
private HkDoorToDoorEfficiencyVO doorToDoorEfficiency;
|
|
||||||
|
|
||||||
@JsonProperty("cross_border_transport_stats")
|
|
||||||
@ApiModelProperty("跨境运输订单")
|
|
||||||
private HkRingChartStatsVO crossBorderTransportStats;
|
|
||||||
|
|
||||||
@JsonProperty("cargo_volume_trend")
|
|
||||||
@ApiModelProperty("货量趋势")
|
|
||||||
private List<HkMonthValuePointVO> cargoVolumeTrend;
|
|
||||||
|
|
||||||
@JsonProperty("transport_order_trend")
|
|
||||||
@ApiModelProperty("运输订单趋势")
|
|
||||||
private List<HkOrderTrendMonthVO> transportOrderTrend;
|
|
||||||
|
|
||||||
@JsonProperty("on_time_delivery_rate")
|
|
||||||
@ApiModelProperty("准时交付率")
|
|
||||||
private List<HkMonthRatePointVO> onTimeDeliveryRate;
|
|
||||||
|
|
||||||
@JsonProperty("map_data")
|
|
||||||
@ApiModelProperty("地图点位")
|
|
||||||
private HkMapDataVO mapData;
|
|
||||||
}
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ApiModel("BI-港澳服务专区-地图数据")
|
|
||||||
public class HkMapDataVO {
|
|
||||||
|
|
||||||
@ApiModelProperty("点位列表")
|
|
||||||
private List<HkMapPointVO> points;
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user