UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug，修改Integer 为int

Browse Source
master
anthonywj 2 years ago
parent cccfe44098
commit 6f7cb9124e
9 changed files with 63 additions and 35 deletions
Show Stats Download Patch File Download Diff File

51
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.inout;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -75,7 +77,7 @@ public class IoOrderDetailBizController extends BaseController {
public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) {
AuthAdmin authAdmin = getUser();
if (addBizProductReqeust.getRelId() == null)
if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas()))
return ResultVOUtils.error(500, "未选择产品信息");
if (addBizProductReqeust.getOrderEntity() == null)
return ResultVOUtils.error(500, "未指定订单");
@ -88,6 +90,10 @@ public class IoOrderDetailBizController extends BaseController {
orderEntity.setCreateUser(authAdmin.getId() + "");
orderEntity.setCreateTime(new Date());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
if (StrUtil.isNotEmpty(orderEntity.getFromInvCode())) {
InvWarehouseEntity fromEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode());
orderEntity.setFromDeptCode(fromEntity.getParentId());
}
orderEntity.setFromType(ConstantStatus.FROM_WEBNEW);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
@ -100,21 +106,34 @@ public class IoOrderDetailBizController extends BaseController {
orderEntity.setInvCode(orderEntity.getInvCode());
orderService.insertOrder(orderEntity);
}
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(addBizProductReqeust.getRelId());
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice());
ioOrderDetailBizEntity.setSupId(addBizProductReqeust.getSupId());
orderDetailBizService.insert(ioOrderDetailBizEntity);
List<AddBizProductReqeust> datas = new ArrayList<>();
if (CollUtil.isNotEmpty(addBizProductReqeust.getDatas())) {
datas.addAll(addBizProductReqeust.getDatas());
} else {
datas.add(addBizProductReqeust);
}
for (AddBizProductReqeust item : datas) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(item.getRelId());
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice());
ioOrderDetailBizEntity.setProductDate(item.getProductDate());
ioOrderDetailBizEntity.setExpireDate(item.getExpireDate());
ioOrderDetailBizEntity.setBatchNo(item.getBatchNo());
ioOrderDetailBizEntity.setSupId(item.getSupId());
orderDetailBizService.insert(ioOrderDetailBizEntity);
}
orderEntity.setUpdateTime(new Date());
orderEntity.setUpdateUser(authAdmin.getId() + "");
orderService.update(orderEntity);

4
src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java
Unescape Escape View File

@ -138,7 +138,7 @@ public class IoOrderDetailBizEntity {
* 单据数量
*/
@TableField(value = "`count`")
private Integer count;
private int count;
/**
* 备注
@ -183,4 +183,4 @@ public class IoOrderDetailBizEntity {
@TableField(exist = false)
private Integer scanCount;
}
}

8
src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java
Unescape Escape View File

@ -138,13 +138,13 @@ public class IoOrderDetailCodeEntity {
* 单据数量
*/
@TableField(value = "`count`")
private Integer count;
private int count;
/**
* 扫码数量
*/
@TableField(value = "reCount")
private Integer reCount;
private int reCount;
/**
* 备注
@ -186,6 +186,6 @@ public class IoOrderDetailCodeEntity {
private boolean checkSuccess;
@TableField(exist = false)
private Integer orderCount;
private int orderCount;
}
}

8
src/main/java/com/glxp/api/entity/inv/InvPreProductEntity.java
Unescape Escape View File

@ -51,19 +51,19 @@ public class InvPreProductEntity {
* 入库数量
*/
@TableField(value = "inCount")
private Integer inCount;
private int inCount;
/**
* 出库数量
*/
@TableField(value = "outCount")
private Integer outCount;
private int outCount;
/**
* 实际数量
*/
@TableField(value = "reCount")
private String reCount;
private int reCount;
/**
* 客户ID
@ -130,4 +130,4 @@ public class InvPreProductEntity {
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATETIME = "updateTime";
}
}

9
src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java
Unescape Escape View File

@ -3,12 +3,21 @@ package com.glxp.api.req.inout;
import com.glxp.api.entity.inout.IoOrderEntity;
import lombok.Data;
import java.util.List;
@Data
public class AddBizProductReqeust {
private IoOrderEntity orderEntity;
//单选添加
private Long relId;
private String zczbhhzbapzbh;
private String supId;
private String batchNo;
private String productDate;
private String expireDate;
List<AddBizProductReqeust> datas; //多选添加
}

4
src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
Unescape Escape View File

@ -115,12 +115,12 @@ public class IoOrderDetailBizResponse {
/**
* 单据数量
*/
private Integer count;
private int count;
/**
* 实际数量
*/
private Integer reCount;
private int reCount;
/**
* 备注

4
src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
Unescape Escape View File

@ -115,12 +115,12 @@ public class IoOrderDetailResultResponse {
/**
* 单据数量
*/
private Integer count;
private int count;
/**
* 扫码数量
*/
private Integer reCount;
private int reCount;
/**
* 备注

6
src/main/java/com/glxp/api/res/inv/InvProductResponse.java
Unescape Escape View File

@ -58,17 +58,17 @@ public class InvProductResponse {
/**
* 入库数量
*/
private Integer inCount;
private int inCount;
/**
* 出库数量
*/
private Integer outCount;
private int outCount;
/**
* 实际数量
*/
private Integer reCount;
private int reCount;
/**
* 客户ID

4
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,9 +4,9 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
password: Glxp@6066
hikari:
connection-timeout: 60000
maximum-pool-size: 60

Write Preview
Loading…
Cancel
Save