java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.签收页面

dev-warehouse
0.0 2 years ago
parent
35c9f163d3
commit
4d799ffba0
16 changed files with 441 additions and 581 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
  2. 2
      blade-gateway/src/main/resources/bootstrap.yml
  3. 14
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
  4. 22
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java
  5. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  6. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
  8. 42
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java
  9. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.java
  10. 202
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
  11. 190
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  12. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  13. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSigndetailService.java
  14. 17
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  15. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java
  16. 494
      doc/dpm/物流租户系统.pdma.json

3
blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
Unescape View File

@ -33,8 +33,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
public class GateWayApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args);
BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME.concat("-lmy"), GateWayApplication.class, args);
}
}

2
blade-gateway/src/main/resources/bootstrap.yml
Unescape View File

@ -1,5 +1,5 @@
server:
port: 9999
port: 8889
spring:
cloud:
gateway:

14
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
Unescape View File

@ -141,7 +141,7 @@ public class DistributionSignforEntity extends TenantEntity {
* 总件数
*/
@ApiModelProperty(value = "总件数")
private Integer total;
private Integer reservationNum;
/**
* 装车件数
*/
@ -241,6 +241,12 @@ public class DistributionSignforEntity extends TenantEntity {
@ApiModelProperty(value = "编号")
private String number;
/**
* 配送单号
*/
@ApiModelProperty(value = "配送单号")
private String noteNumber;
/**
* 配送关联id
*/
@ -253,6 +259,12 @@ public class DistributionSignforEntity extends TenantEntity {
@ApiModelProperty(value = "配送时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String deliveryTime;
/**
* 装车时间
*/
@ApiModelProperty(value = "装车时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String loadingTime;
}

22
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java
Unescape View File

@ -41,7 +41,7 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
* 客户名称
*/
@ApiModelProperty(value = "客户名称")
private String consigneeName;
private String consignee;
/**
* 客户Id
*/
@ -62,6 +62,26 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
*/
@ApiModelProperty(value = "服务号")
private String serviceNumber;
/**
* 配送类型
*/
@ApiModelProperty(value = "服务号")
private String deliveryType;
/**
* 订单自编号
*/
@ApiModelProperty(value = "订单自编号")
private String stockArticleId;
/**
* 商城名称
*/
@ApiModelProperty(value = "商城名称")
private String shoppingName;
/**
* 仓库名称
*/
@ApiModelProperty(value = "仓库名称")
private String warehouse;
// /**
// * 订单自编号;订单关联id
// */

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
Unescape View File

@ -137,6 +137,7 @@ public class DistributionDeliveryListController extends BladeController {
R msg = distributionDeliveryListService.loadinginventory(distrilbutionloadingscanDTO);
return msg;
}
/**
* 配送管理 装车扫描（取消）
*/
@ -153,8 +154,8 @@ public class DistributionDeliveryListController extends BladeController {
*/
@GetMapping("/oneloading")
@ApiOperationSupport(order = 2)
public R oneloading() {
R msg = distributionDeliveryListService.oneloading();
public R oneloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.oneloading(distrilbutionloadingscanDTO);
return msg;
}

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java
Unescape View File

@ -98,6 +98,17 @@ public class DistributionSigndetailController extends BladeController {
return R.data(distributionSigndetailVO);
}
/**
* 签收明细 详情
*/
@GetMapping("/detailById")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入distributionSigndetail")
public R<DistributionSigndetailVO> detailById(DistributionSigndetailDTO distributionSigndetail) {
DistributionSigndetailVO distributionSigndetailVO = distributionSigndetailService.getOneById(distributionSigndetail.getId());
return R.data(distributionSigndetailVO);
}
/**
* 签收明细 分页
*/
@ -118,7 +129,7 @@ public class DistributionSigndetailController extends BladeController {
public R<IPage<DistributionSigndetailVO>> page(DistributionSigndetailDTO distributionSigndetail, Query query) {
// log.info("接收>>>>>>>>>>>>>>>{}",distributionSigndetail.getWarehousingTime());
//获取当前登录用户
BladeUser user = AuthUtil.getUser();
// BladeUser user = AuthUtil.getUser();
IPage<DistributionSigndetailVO> pages = distributionSigndetailService.selectDistributionSigndetailPage(Condition.getPage(query), distributionSigndetail);
return R.data(pages);
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
Unescape View File

@ -78,10 +78,10 @@ public class DistributionSignforController extends BladeController {
DistributionSignforVO distributionSignforVO = new DistributionSignforVO();
BeanUtils.copyProperties(detail,distributionSignforVO);
//查询预约单号及服务
return R.data(distributionSignforVO);
}
/**
* 签收管理 签收订单统计
*/

42
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java
Unescape View File

@ -36,15 +36,20 @@ import java.util.Date;
public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
private static final long serialVersionUID = 1L;
/**
* 客户
* 客户名称
*/
@ApiModelProperty(value = "客户")
private String consigneeName;
@ApiModelProperty(value = "客户名称")
private String consignee;
/**
* 客户Id
*/
@ApiModelProperty(value = "客户Id")
private String consigneeId;
/**
* 客户电话
*/
@ApiModelProperty(value = "客户电话")
private String consigneePhone;
private String deliveryPhone;
/**
* 收货地址
*/
@ -55,11 +60,36 @@ public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
*/
@ApiModelProperty(value = "服务号")
private String serviceNumber;
/**
* 配送类型
*/
@ApiModelProperty(value = "服务号")
private String deliveryType;
/**
* 订单自编号
*/
@ApiModelProperty(value = "订单自编号")
private String stockArticleId;
/**
* 商城名称
*/
@ApiModelProperty(value = "商城名称")
private String shoppingName;
/**
* 仓库名称
*/
@ApiModelProperty(value = "仓库名称")
private String warehouse;
// /**
// * 订单自编号;订单关联id
// */
// @ApiModelProperty(value = "订单自编号;订单关联id")
// private String orderId;
/**
* 签收时间
* 文员签收时间
*/
@ApiModelProperty(value = "签收时间")
@ApiModelProperty(value = "文员签收时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String signingTime;
/**

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.java
Unescape View File

@ -52,4 +52,5 @@ public interface DistributionSigndetailMapper extends BaseMapper<DistributionSig
*/
List<DistributionSigndetailExcel> exportDistributionSigndetail(@Param("ew") Wrapper<DistributionSigndetailEntity> queryWrapper);
DistributionSigndetailVO selectVOById(Long id);
}

202
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
Unescape View File

@ -31,88 +31,152 @@
<result column="lead_time" property="leadTime"/>
<result column="store_time" property="storeTime"/>
<result column="signed_number" property="signedNumber"/>
<result column="is_kitting" property="isKitting"/>
<result column="brand" property="brand"/>
</resultMap>
<!-- <select id="selectDistributionSigndetailPage" resultType="com.logpm.distribution.vo.DistributionSigndetailVO">-->
<!-- SELECT-->
<!-- ldsd.id id,-->
<!-- ldsf.service_number serviceNumber,-->
<!-- ldsd.delivery_number deliveryNumber,-->
<!-- ldsd.train_number trainNumber,-->
<!-- ldsd.serve_type serveType,-->
<!-- ldsd.order_id orderId,-->
<!-- ldsd.order_self_numbering orderSelfNumbering,-->
<!-- ldsd.mall_name mallName,-->
<!-- ldsd.description_goods descriptionGoods,-->
<!-- ldsd.warehouse warehouse,-->
<!-- ldsd.warehouse_entry_time warehouseEntryTime,-->
<!-- ldsd.lead_time leadTime,-->
<!-- ldsd.store_time storeTime,-->
<!-- ldsd.complete_set completeSet,-->
<!-- ldsd.brand brand,-->
<!-- ldsd.signed_number signedNumber,-->
<!-- ldsf.consignee_name consigneeName,-->
<!-- ldsf.consignee_id consigneeId,-->
<!-- ldsf.signing_time signingTime,-->
<!-- ldsf.sjsigning_time sjsigningTime,-->
<!-- ldsf.delivery_phone deliveryPhone,-->
<!-- ldsf.order_self_numbering orderSelfNumbering,-->
<!-- ldsf.delivery_address deliveryAddress-->
<!-- FROM-->
<!-- logpm_distribution_signdetail ldsd-->
<!-- JOIN logpm_distribution_signfor ldsf ON ldsd.master_id = ldsf.id-->
<!-- <where>-->
<!-- ldsd.is_deleted = 0-->
<!-- <if test="param.serviceNumber!=null and param.serviceNumber!=''">-->
<!-- and ldsf.service_number like concat('%',#{param.serviceNumber},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryNumber!=null and param.deliveryNumber!=''">-->
<!-- and ldsd.delivery_number like concat('%',#{param.deliveryNumber},'%')-->
<!-- </if>-->
<!-- <if test="param.trainNumber!=null and param.trainNumber!=''">-->
<!-- and ldsd.train_number like concat('%',#{param.trainNumber},'%')-->
<!-- </if>-->
<!-- <if test="param.serveType!=null and param.serveType!=''">-->
<!-- and ldsd.serve_type=#{param.serveType}-->
<!-- </if>-->
<!-- <if test="param.orderId!=null and param.orderId!=''">-->
<!-- and ldsd.order_id like concat('%',#{param.orderId},'%')-->
<!-- </if>-->
<!-- <if test="param.mallName!=null and param.mallName!=''">-->
<!-- and ldsd.mall_name like concat('%',#{param.mallName},'%')-->
<!-- </if>-->
<!-- <if test="param.descriptionGoods!=null and param.descriptionGoods!=''">-->
<!-- and ldsd.description_goods like concat('%',#{param.descriptionGoods},'%')-->
<!-- </if>-->
<!-- <if test="param.warehouseName!=null and param.warehouseName!=''">-->
<!-- and ldsf.warehouse_name like concat('%',#{param.warehouseName},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryAddress!=null and param.deliveryAddress!=''">-->
<!-- and ldsf.deliveryAddress like concat('%',#{param.deliveryAddress},'%')-->
<!-- </if>-->
<!-- <if test="param.consigneeName!=null and param.consigneeName!=''">-->
<!-- and ldsd.consignee_name like concat('%',#{param.consigneeName},'%')-->
<!-- </if>-->
<!-- <if test="param.consigneePhone!=null and param.consigneePhone!=''">-->
<!-- and ldsd.consignee_phone like concat('%',#{param.consigneePhone},'%')-->
<!-- </if>-->
<!-- <if test="param.warehouseEntryTime!=null and param.warehouseEntryTime!=''">-->
<!-- and date_format(ldsd.warehouse_entry_time,'%y%m%d%') = date_format(#{param.warehouseEntryTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.signingTime!=null and param.signingTime!=''">-->
<!-- and date_format(ldsf.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">-->
<!-- and date_format(ldsf.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.leadTime!=null and param.leadTime!=''">-->
<!-- and date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')-->
<!-- </if>-->
<!-- </where>-->
<!-- order by ldsd.create_time desc-->
<!-- </select>-->
<select id="selectDistributionSigndetailPage" resultType="com.logpm.distribution.vo.DistributionSigndetailVO">
SELECT
ldsd.id id,
ldsf.service_number serviceNumber,
ldsd.delivery_number deliveryNumber,
ldsd.train_number trainNumber,
ldsd.serve_type serveType,
ldsd.order_id orderId,
ldsd.order_self_numbering orderSelfNumbering,
ldsd.mall_name mallName,
ldsd.description_goods descriptionGoods,
ldsd.warehouse warehouse,
ldsd.warehouse_entry_time warehouseEntryTime,
ldsd.lead_time leadTime,
ldsd.store_time storeTime,
ldsd.complete_set completeSet,
ldsd.brand brand,
ldsd.signed_number signedNumber,
ldsf.consignee_name consigneeName,
ldsf.consignee_id consigneeId,
ldsf.signing_time signingTime,
ldsf.sjsigning_time sjsigningTime,
ldsf.delivery_phone deliveryPhone,
ldsf.order_self_numbering orderSelfNumbering,
ldsf.delivery_address deliveryAddress
FROM
logpm_distribution_signdetail ldsd
JOIN logpm_distribution_signfor ldsf ON ldsd.master_id = ldsf.id
distinct ldsa.id id,
lds.service_number serviceNumber,
lds.note_number noteNumber,
lds.train_number trainNumber,
lds.delivery_type deliveryType,
lds.stock_article_id stockArticleId,
lds.shopping_name shoppingName,
ldsa.description_goods descriptionGoods,
ldsa.warehouse warehouse,
ldsa.warehouse_entry_time warehouseEntryTime,
lds.signing_time signingTime,
lds.sjsigning_time sjsigningTime,
ldsa.store_time storeTime,
ldsa.total_number totalNumber,
ldsa.brand brand,
lds.consignee consignee,
lds.delivery_phone deliveryPhone,
lds.delivery_address deliveryAddress,
ldsa.complete_set completeSet
from
logpm_distribution_loadscan ldl
JOIN logpm_distribution_signfor lds ON lds.reservation_id = ldl.reservation_id
join logpm_distribution_stock_article ldsa on ldl.order_id = ldsa.id
<where>
ldsd.is_deleted = 0
lds.is_deleted = 0
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
and ldsf.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.deliveryNumber!=null and param.deliveryNumber!=''">
and ldsd.delivery_number like concat('%',#{param.deliveryNumber},'%')
and lds.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.trainNumber!=null and param.trainNumber!=''">
and ldsd.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.serveType!=null and param.serveType!=''">
and ldsd.serve_type=#{param.serveType}
</if>
<if test="param.orderId!=null and param.orderId!=''">
and ldsd.order_id like concat('%',#{param.orderId},'%')
</if>
<if test="param.mallName!=null and param.mallName!=''">
and ldsd.mall_name like concat('%',#{param.mallName},'%')
and lds.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.descriptionGoods!=null and param.descriptionGoods!=''">
and ldsd.description_goods like concat('%',#{param.descriptionGoods},'%')
and ldsa.description_goods like concat('%',#{param.descriptionGoods},'%')
</if>
<if test="param.warehouseName!=null and param.warehouseName!=''">
and ldsf.warehouse_name like concat('%',#{param.warehouseName},'%')
<if test="param.warehouse!=null and param.warehouse!=''">
and ldsa.warehouse like concat('%',#{param.warehouse},'%')
</if>
<if test="param.deliveryAddress!=null and param.deliveryAddress!=''">
and ldsf.deliveryAddress like concat('%',#{param.deliveryAddress},'%')
</if>
<if test="param.consigneeName!=null and param.consigneeName!=''">
and ldsd.consignee_name like concat('%',#{param.consigneeName},'%')
<if test="param.consignee!=null and param.consignee!=''">
and lds.consignee like concat('%',#{param.consignee},'%')
</if>
<if test="param.consigneePhone!=null and param.consigneePhone!=''">
and ldsd.consignee_phone like concat('%',#{param.consigneePhone},'%')
<if test="param.completeSet!=null and param.completeSet!=''">
and ldsa.complete_set like concat('%',#{param.completeSet},'%')
</if>
<if test="param.deliveryPhone!=null and param.deliveryPhone!=''">
and lds.delivery_phone like concat('%',#{param.deliveryPhone},'%')
</if>
<if test="param.warehouseEntryTime!=null and param.warehouseEntryTime!=''">
and date_format(ldsd.warehouse_entry_time,'%y%m%d%') = date_format(#{param.warehouseEntryTime},'%y%m%d%')
and date_format(ldsa.warehouse_entry_time,'%y%m%d%') = date_format(#{param.warehouseEntryTime},'%y%m%d%')
</if>
<if test="param.signingTime!=null and param.signingTime!=''">
and date_format(ldsf.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
and date_format(ldsa.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
</if>
<if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
and date_format(ldsf.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
</if>
<if test="param.leadTime!=null and param.leadTime!=''">
and date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
and date_format(ldsa.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
</if>
<!-- <if test="param.leadTime!=null and param.leadTime!=''">-->
<!-- and date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')-->
<!-- </if>-->
</where>
order by ldsd.create_time desc
</select>
@ -120,5 +184,31 @@
SELECT *
FROM logpm_distribution_signdetail ${ew.customSqlSegment}
</select>
<select id="selectVOById" resultType="com.logpm.distribution.vo.DistributionSigndetailVO">
SELECT
distinct ldsa.id id,
lds.service_number serviceNumber,
lds.note_number noteNumber,
lds.train_number trainNumber,
lds.delivery_type deliveryType,
lds.stock_article_id stockArticleId,
lds.shopping_name shoppingName,
ldsa.description_goods descriptionGoods,
ldsa.warehouse warehouse,
ldsa.warehouse_entry_time warehouseEntryTime,
lds.signing_time signingTime,
lds.sjsigning_time sjsigningTime,
ldsa.store_time storeTime,
ldsa.total_number totalNumber,
ldsa.brand brand,
lds.consignee consignee,
lds.delivery_phone deliveryPhone,
lds.delivery_address deliveryAddress,
ldsa.complete_set completeSet
from
logpm_distribution_loadscan ldl
JOIN logpm_distribution_signfor lds ON lds.reservation_id = ldl.reservation_id
join logpm_distribution_stock_article ldsa on ldl.order_id = ldsa.id
</select>
</mapper>

190
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
Unescape View File

@ -20,7 +20,7 @@
<result column="reserve5" property="reserve5"/>
<result column="order_id" property="orderId"/>
<result column="reservation_id" property="reservationId"/>
<result column="consignee" property="consigneeName"/>
<result column="consignee" property="consignee"/>
<result column="consignee" property="consigneeId"/>
<result column="delivery_address" property="deliveryAddress"/>
<result column="warehouse_name" property="warehouseName"/>
@ -135,92 +135,160 @@
<!-- </if>-->
<!-- </where>-->
<!-- </select>-->
<!-- <select id="selectDistributionSignforPage" resultType="com.logpm.distribution.vo.DistributionSignforVO">-->
<!-- SELECT-->
<!-- id id,-->
<!-- number number,-->
<!-- order_id orderId,-->
<!-- reservation_id reservationId,-->
<!-- consignee_id consigneeId,-->
<!-- consignee_name consigneeName,-->
<!-- delivery_phone deliveryPhone,-->
<!-- delivery_address delivery_Address,-->
<!-- delivery_type deliveryType,-->
<!-- delivery_way deliveryWay,-->
<!-- warehouse_name warehouseName,-->
<!-- warehouse_id warehouseId,-->
<!-- train_number trainNumber,-->
<!-- order_total orderTotal,-->
<!-- total total,-->
<!-- loaded_number loadedNumber,-->
<!-- received_quantity receivedQuantity,-->
<!-- delivery_driver_name deliveryDriverName,-->
<!-- delivery_driver_id deliveryDriverId,-->
<!-- delivery_driver_phone deliveryDriverPhone,-->
<!-- signing_time signingTime,-->
<!-- sjsigning_time sjsigningTime,-->
<!-- signee_name signeeName,-->
<!-- signee_id signeeId,-->
<!-- signing_status signingStatus,-->
<!-- driver_signing driverSigning,-->
<!-- signing_type signingType,-->
<!-- clerk_sign_pictures clerkSignPictures,-->
<!-- delivery_sign_pictures deliverySignPictures,-->
<!-- service_number serviceNumber,-->
<!-- notes notes,-->
<!-- delivery_time deliveryTime,-->
<!-- delivery_vehicle_id deliveryVehicleId,-->
<!-- delivery_vehicle_name deliveryVehicleName,-->
<!-- shopping_name shoppingName,-->
<!-- order_source orderSource-->
<!-- FROM-->
<!-- logpm_distribution_signfor-->
<!-- <where>-->
<!-- is_deleted = 0-->
<!-- <if test="param.number != null and param.number!=''">-->
<!-- and number like concat('%',#{param.number},'%')-->
<!-- </if>-->
<!-- <if test="param.shoppingName != null and param.shoppingName!=''">-->
<!-- and shopping_name like concat('%',#{param.shoppingName},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryTime!=null and param.deliveryTime!=''">-->
<!-- and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.signingTime!=null and param.signingTime!=''">-->
<!-- and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">-->
<!-- and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.orderId != null and param.orderId!=''">-->
<!-- and order_id like concat('%',#{param.orderId},'%')-->
<!-- </if>-->
<!-- <if test="param.consigneeName != null and param.consigneeName!=''">-->
<!-- and consignee_name like concat('%',#{param.consigneeName},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryType != null and param.deliveryType!=''">-->
<!-- and delivery_type = #{param.deliveryType}-->
<!-- </if>-->
<!-- <if test="param.signingStatus != null and param.signingStatus!=''">-->
<!-- and signing_status = #{param.signingStatus}-->
<!-- </if>-->
<!-- <if test="param.orderSource != null and param.orderSource!=''">-->
<!-- and order_source = #{param.orderSource}-->
<!-- </if>-->
<!-- <if test="param.deliveryPhone != null and param.deliveryPhone!=''">-->
<!-- and delivery_phone = #{param.deliveryPhone}-->
<!-- </if>-->
<!-- <if test="param.trainNumber != null and param.trainNumber!=''">-->
<!-- and train_number like concat('%',#{param.trainNumber},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryDriverName != null and param.deliveryDriverName!=''">-->
<!-- and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryAddress != null and param.deliveryAddress!=''">-->
<!-- and delivery_address like concat('%',#{param.deliveryAddress},'%')-->
<!-- </if>-->
<!-- <if test="param.driverSigning != null and param.driverSigning!=''">-->
<!-- and driver_signing = #{param.driverSigning}-->
<!-- </if>-->
<!-- </where>-->
<!-- </select> -->
<select id="selectDistributionSignforPage" resultType="com.logpm.distribution.vo.DistributionSignforVO">
SELECT
id id,
number number,
order_id orderId,
reservation_id reservationId,
consignee_id consigneeId,
consignee_name consigneeName,
delivery_phone deliveryPhone,
delivery_address delivery_Address,
delivery_type deliveryType,
delivery_way deliveryWay,
warehouse_name warehouseName,
warehouse_id warehouseId,
train_number trainNumber,
order_total orderTotal,
total total,
loaded_number loadedNumber,
received_quantity receivedQuantity,
delivery_driver_name deliveryDriverName,
delivery_driver_id deliveryDriverId,
delivery_driver_phone deliveryDriverPhone,
signing_time signingTime,
sjsigning_time sjsigningTime,
signee_name signeeName,
signee_id signeeId,
signing_status signingStatus,
driver_signing driverSigning,
signing_type signingType,
clerk_sign_pictures clerkSignPictures,
delivery_sign_pictures deliverySignPictures,
service_number serviceNumber,
notes notes,
delivery_time deliveryTime,
delivery_vehicle_id deliveryVehicleId,
delivery_vehicle_name deliveryVehicleName,
shopping_name shoppingName,
order_source orderSource
lds.id id,
lds.shopping_name shoppingName,
lds.stock_article_id stockArticleId,
lds.consignee consignee,
lds.delivery_type deliveryType,
lds.delivery_time deliveryTime,
lds.order_source orderSource,
lds.train_number trainNumber,
lds.delivery_phone deliveryPhone,
lds.delivery_driver_name deliveryDriverName,
lds.delivery_address deliveryAddress,
lds.sjsigning_time sjsigningTime,
lds.signing_time signingTime,
lds.delivery_sign_pictures deliverySignPictures,
lds.reservation_num reservationNum,
lds.driver_signing driverSigning,
(SELECT sum(ldl.package_nub) from logpm_distribution_loadscan ldl WHERE ldl.reservation_id = lds.reservation_id and ldl.scan_status !=1) loadedNumber,
COALESCE((SELECT sum(ldl.received_quantity) from logpm_distribution_loadscan ldl WHERE ldl.reservation_id = lds.reservation_id and lds.driver_signing ='2'), 0) receivedQuantity
FROM
logpm_distribution_signfor
logpm_distribution_signfor lds
<where>
is_deleted = 0
<if test="param.number != null and param.number!=''">
and number like concat('%',#{param.number},'%')
</if>
lds.is_deleted = 0
<if test="param.shoppingName != null and param.shoppingName!=''">
and shopping_name like concat('%',#{param.shoppingName},'%')
and lds.shopping_name like concat('%',#{param.shoppingName},'%')
</if>
<if test="param.deliveryTime!=null and param.deliveryTime!=''">
and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
</if>
<if test="param.signingTime!=null and param.signingTime!=''">
and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
and date_format(lds.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
</if>
<if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
and date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
</if>
<if test="param.orderId != null and param.orderId!=''">
and order_id like concat('%',#{param.orderId},'%')
<if test="param.stockArticleId != null and param.stockArticleId!=''">
and lds.stock_article_id like concat('%',#{param.stockArticleId},'%')
</if>
<if test="param.consigneeName != null and param.consigneeName!=''">
and consignee_name like concat('%',#{param.consigneeName},'%')
<if test="param.consignee != null and param.consignee!=''">
and lds.consignee like concat('%',#{param.consignee},'%')
</if>
<if test="param.deliveryType != null and param.deliveryType!=''">
and delivery_type = #{param.deliveryType}
and lds.delivery_type = #{param.deliveryType}
</if>
<if test="param.signingStatus != null and param.signingStatus!=''">
and signing_status = #{param.signingStatus}
</if>
<if test="param.orderSource != null and param.orderSource!=''">
and order_source = #{param.orderSource}
and lds.order_source = #{param.orderSource}
</if>
<if test="param.deliveryPhone != null and param.deliveryPhone!=''">
and delivery_phone = #{param.deliveryPhone}
and lds.delivery_phone like concat('%',#{param.deliveryPhone},'%')
</if>
<if test="param.trainNumber != null and param.trainNumber!=''">
and train_number like concat('%',#{param.trainNumber},'%')
and lds.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.deliveryDriverName != null and param.deliveryDriverName!=''">
and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%')
and lds.delivery_driver_name like concat('%',#{param.deliveryDriverName},'%')
</if>
<if test="param.deliveryAddress != null and param.deliveryAddress!=''">
and delivery_address like concat('%',#{param.deliveryAddress},'%')
and lds.delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
<if test="param.driverSigning != null and param.driverSigning!=''">
and driver_signing = #{param.driverSigning}
and lds.driver_signing = #{param.driverSigning}
</if>
</where>
</select>
@ -266,8 +334,8 @@
<if test="param.orderId != null and param.orderId!=''">
and order_id like concat('%',#{param.orderId},'%')
</if>
<if test="param.consigneeName != null and param.consigneeName!=''">
and consignee_name like concat('%',#{param.consigneeName},'%')
<if test="param.consignee != null and param.consignee!=''">
and consignee like concat('%',#{param.consignee},'%')
</if>
<if test="param.deliveryType != null and param.deliveryType!=''">
and delivery_type = #{param.deliveryType}
@ -314,8 +382,8 @@
<if test="param.orderId != null and param.orderId!=''">
and order_id like concat('%',#{param.orderId},'%')
</if>
<if test="param.consigneeName != null and param.consigneeName!=''">
and consignee_name like concat('%',#{param.consigneeName},'%')
<if test="param.consignee != null and param.consignee!=''">
and consignee like concat('%',#{param.consignee},'%')
</if>
<if test="param.deliveryType != null and param.deliveryType!=''">
and delivery_type = #{param.deliveryType}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
Unescape View File

@ -87,7 +87,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
/**
*装车扫描(一键装车)
*/
R oneloading();
R oneloading(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
*装车扫描(一键确认)
*/

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSigndetailService.java
Unescape View File

@ -49,5 +49,11 @@ public interface IDistributionSigndetailService extends BaseService<Distribution
* @return
*/
List<DistributionSigndetailExcel> exportDistributionSigndetail(Wrapper<DistributionSigndetailEntity> queryWrapper);
/**
* 自定义查询详情
*
* @param id
* @return
*/
DistributionSigndetailVO getOneById(Long id);
}

17
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -190,7 +190,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionSignforEntity.setOrderTotal(i);
//该客户总件数
Integer i1 = distributionDeliveryInfoMapper.selectWrapCount(e.getId());
distributionSignforEntity.setTotal(i1);
distributionSignforEntity.setReservationNum(i1);
//装车件数
Integer dre = distributionLoadscanMapper.selectWrapdreCount(e.getId());
distributionSignforEntity.setLoadedNumber(dre);
@ -278,7 +278,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
BeanUtils.copyProperties(distributionReservationEntity,distributionSignforEntity);
distributionSignforEntity.setReservationId(distributionReservationEntity.getId());
//设置车次
distributionSignforEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
distributionSignforEntity.setDeliveryType(distributionDeliveryListEntity.getType());
distributionSignforEntity.setId(null);
distributionSignforEntity.setLoadingTime(distributionDeliveryListEntity.getLoadingTime());
distributionSignforEntity.setDeliveryDriverName(distributionDeliveryListEntity.getDriverName());
distributionSignforEntity.setSigningStatus("1");
distributionSignforEntity.setDriverSigning("1");
distributionSignforMapper.insert(distributionSignforEntity);
}
}
@ -352,11 +359,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public R oneloading() {
//获取当前用户司机
BladeUser user = AuthUtil.getUser();
public R oneloading(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
//TODO 用个配送司机车辆中间表字段存储状态
//查询是否属于该配送任务
Long deliveryId = distrilbutionloadingscanDTO.getDeliveryId();
//将该客户所有的物品上该车辆
return null;
}

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java
Unescape View File

@ -63,4 +63,9 @@ public class DistributionSigndetailServiceImpl extends BaseServiceImpl<Distribut
return distributionSigndetailList;
}
@Override
public DistributionSigndetailVO getOneById(Long id) {
return baseMapper.selectVOById(id);
}
}

494
doc/dpm/物流租户系统.pdma.json
Unescape View File

@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2023-3-27 13:32:56",
"updatedTime": "2023-7-10 15:13:23",
"updatedTime": "2023-7-10 18:06:09",
"dbConns": [],
"profile": {
"default": {
@ -7490,6 +7490,57 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "82C7F0A0-5A6E-4B92-A459-9B8CD2A020AE"
},
{
"defKey": "logpm_unit",
"defName": "计量单位",
"comment": "码表",
"type": "VARCHAR",
"len": 20,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "88FFA0BF-3DA2-4C29-ADBA-5526B9D33927"
},
{
"defKey": "sku",
"defName": "sku",
"comment": "",
"type": "VARCHAR",
"len": 50,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "0376757A-C3EF-4105-81B0-6861784F4664"
},
{
"defKey": "package_number",
"defName": "包装数量",
"comment": "",
"type": "INT",
"len": 10,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "781A6012-4171-4E48-B5B0-9108028722DA"
}
],
"correlations": [],
@ -38209,447 +38260,6 @@
"correlations": [],
"indexes": []
},
{
"id": "15F3E873-AE8D-4CB8-8F1A-136F8709BFEA",
"env": {
"base": {
"nameSpace": "",
"codeRoot": ""
}
},
"defKey": "package_receipt",
"defName": "包条签收明细",
"comment": "",
"properties": {
"partitioned by": "(date string)",
"row format delimited": "",
"fields terminated by ','": "",
"collection items terminated by '-'": "",
"map keys terminated by ':'": "",
"store as textfile;": ""
},
"nameTemplate": "{defKey}[{defName}]",
"notes": {},
"headers": [
{
"refKey": "hideInGraph",
"hideInGraph": true
},
{
"refKey": "defKey",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "defName",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "primaryKey",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "notNull",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "autoIncrement",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "domain",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "type",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "len",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "scale",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "comment",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "refDict",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "defaultValue",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "isStandard",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "uiHint",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "extProps",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr1",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr2",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr3",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr4",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr5",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr6",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr7",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr8",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr9",
"freeze": false,
"hideInGraph": true
}
],
"fields": [
{
"defKey": "tenant_id",
"defName": "租户号",
"comment": "",
"type": "",
"len": 32,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"refDict": "",
"uiHint": "",
"id": "BC3F264F-7B1F-4A18-849C-4B435E30F173"
},
{
"defKey": "create_user",
"defName": "创建人",
"comment": "",
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"type": "",
"len": 32,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "5FFDEA39-4CB6-42F2-AD63-4A3E8A2EEB3A"
},
{
"defKey": "create_time",
"defName": "创建时间",
"comment": "",
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "0951597A-A6AE-4809-ABF9-128C58BD49E4"
},
{
"defKey": "update_user",
"defName": "更新人",
"comment": "",
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"type": "",
"len": 32,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "82CE0DA3-F4F2-4617-BEFA-164503225781"
},
{
"defKey": "update_time",
"defName": "更新时间",
"comment": "",
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "FA3F1722-80AA-42A9-9F71-560AA28ADEA6"
},
{
"defKey": "status",
"defName": "状态",
"comment": "",
"type": "INT",
"len": 2,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "31959B8B-D071-426D-A441-ABE328FCB738"
},
{
"defKey": "is_deleted",
"defName": "是否已删除",
"comment": "",
"type": "INT",
"len": 2,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "9253C196-5171-496D-980C-0CD15C66EE3A"
},
{
"defKey": "create_dept",
"defName": "创建部门",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "3D551CE5-623A-4A81-8169-69D2D3BF7A92"
},
{
"defKey": "id",
"defName": "主键",
"comment": "",
"type": "INT",
"len": 20,
"scale": "",
"primaryKey": true,
"notNull": true,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "CF9FB2A0-814E-4DEF-9496-F3BCB3448E73"
},
{
"defKey": "reserve1",
"defName": "预留1",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "047E5BAB-6E08-4F47-8434-C1DBBAA54D6A"
},
{
"defKey": "reserve2",
"defName": "预留2",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "2A3B73D5-2C26-4CD5-AE3A-0EC7D6EC921E"
},
{
"defKey": "reserve3",
"defName": "预留3",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "51BD0E19-02B6-49C3-B73D-FEC5A649B3DC"
},
{
"defKey": "reserve4",
"defName": "预留4",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "107D33FC-615C-42E3-8A69-5BD03AEBA8C3"
},
{
"defKey": "reserve5",
"defName": "预留5",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "6C89DE81-752F-4194-A140-A1CABF917B80"
},
{
"defKey": "wrap_bar_id",
"defName": "包条表id",
"comment": "",
"type": "INT",
"len": 20,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "15E81448-AE1E-41C1-A66D-DA31E858303F"
},
{
"defKey": "receipt_details_id",
"defName": "签收明细id",
"comment": "",
"type": "VARCHAR",
"len": 20,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "BA1A2799-F4FD-42E4-AEA3-400AB8B6E499"
},
{
"defKey": "received_quantity",
"defName": "签收数量",
"comment": "",
"type": "INT",
"len": 10,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "ABC53613-D54B-4D54-A97B-144D4E5B4206"
}
],
"correlations": [],
"indexes": []
},
{
"id": "31ABAF40-A555-486D-ABD7-AF63F96288AE",
"env": {

Write Preview
Loading…
Cancel
Save