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

Merge branch 'feature-order-fix' into orderChange

Browse Source 
# Conflicts:
#	api-admin/src/main/resources/schemas/schema_v2.1.sql
zhairh
郑明梁 3 years ago
parent f07c4a7c48 258bddc213
commit 5ffa258f9b
13 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -301,6 +301,8 @@ public class WareHouseController {
orderEntity1.setPreCheck(addOrderRequest.isPreCheck());
orderEntity1.setUpdateTime(new Date());
orderEntity1.setCodeFillCheck(addOrderRequest.isCodeFillCheck());
orderEntity1.setInvStorageCode(addOrderRequest.getInvStorageCode());
orderEntity1.setSubInvCode(addOrderRequest.getSubInvCode());
orderService.updateOrder(orderEntity1);
WarehouseEntity warehouseEntity = new WarehouseEntity();
warehouseEntity.setOrderId(addOrderRequest.getOrderId());

5
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
Unescape Escape View File

@ -87,12 +87,7 @@ public class InvSubWarehouseController {
}
} else{
if(filterInvWarehouseRequest.getFilter()==3 && filterInvWarehouseRequest.getFilter()!=null){
if (authAdmin.getCustomerId()==110)
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
else {
filterInvWarehouseRequest.setSpUse(true);
}
}else{
//走这边表示单据选择的是往来单位里面调出调入的库
//判断单据类型是1就是设置单据需要需要查询除自己以外的分库

3
api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
Unescape Escape View File

@ -88,4 +88,7 @@ public class OrderEntity {
private String uploadStatus;
private String wzUploadStatus;
private String wzUploadResult;
private String subInvCode;
}

1
api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java
Unescape Escape View File

@ -18,6 +18,7 @@ public class ThrOrderEntity {
private String billFlag;
private String thirdSysFk;
private Date updateTime;
private Date thirdPartyDate;
private String originType;
//增加字段

1
api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java
Unescape Escape View File

@ -58,5 +58,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String unitFk;
private String originUuid;
private String relId;
private String companyName;
}

2
api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java
Unescape Escape View File

@ -35,5 +35,7 @@ public class AddOrderRequest {
private boolean codeFillCheck;
private String deptCode;
private String subInvCode;
private String invStorageCode;
}

5
api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java
Unescape Escape View File

@ -225,7 +225,8 @@ public class CodesServiceImpl implements CodesService {
} else {
filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo());
}
InvProductEntity invProductEntity = invProductDao.filterInvProduct(filterInvProductRequest).get(0);
List<InvProductEntity> invProductEntityList=invProductDao.filterInvProduct(filterInvProductRequest);
InvProductEntity invProductEntity = invProductEntityList.get(0);
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库
invProductEntity.setInCount(invProductEntity.getInCount() - 1);
@ -278,7 +279,7 @@ public class CodesServiceImpl implements CodesService {
StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailEntities.get(0);
if (stockOrderDetailEntity.getReCount() > 1) {
stockOrderDetailEntity.setReCount(stockOrderDetailEntity.getReCount()- 1); //实际数量 - 1
stockOrderDetailEntity.setSweepCount(stockOrderDetailEntity.getSweepCount() -1); //扫码数量 -1
stockOrderDetailEntity.setSweepCount(stockOrderDetailEntity.getSweepCount()==null?0:stockOrderDetailEntity.getSweepCount() -1); //扫码数量 -1
//更新业务单据详情
stockOrderDetailDao.updateById(stockOrderDetailEntity);
} else {

13
api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
Unescape Escape View File

@ -308,17 +308,20 @@ public class OrderServiceImpl implements OrderService {
} else {
supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据
}
String name = invWarehouseDao.getNameByCode(supplementOrder.getInvStorageCode());
supplementOrder.setExportStatus(0); //设置导出状态为未导出
supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验
supplementOrder.setReceiveStatus(0); //设置验收状态为未验收
supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
//修改往来单位及当前库存号
supplementOrder.setFromCorpId(order.getLocStorageCode());
supplementOrder.setFromCorpId(order.getInvWarehouseCode());
supplementOrder.setFromCorp(name);
supplementOrder.setFromSubInvCode(order.getInvWarehouseCode());
supplementOrder.setLocStorageCode(order.getFromCorpId());
supplementOrder.setLocStorageCode(order.getSubInvCode());
supplementOrder.setSubInvCode(order.getInvStorageCode());
supplementOrder.setInvWarehouseCode(null);
String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
supplementOrder.setInvStorageCode(order.getSubInvCode());
if (StrUtil.isNotEmpty(order.getFromSubInvCode())) {
supplementOrder.setInvWarehouseCode(order.getFromSubInvCode());
} else {
@ -328,8 +331,6 @@ public class OrderServiceImpl implements OrderService {
}
}
supplementOrder.setFromCorp(name);
supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE);
BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());

2
api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
Unescape Escape View File

@ -141,7 +141,7 @@
AND basic_udirel.id = #{id}
</if>
<if test="companyName != '' and companyName != null">
AND customer_info.companyName = #{companyName}
AND basic_corp.name = #{companyName}
</if>
<if test="lockStatus != '' and lockStatus != null">
AND basic_udirel.lockStatus = #{lockStatus}

4
api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
Unescape Escape View File

@ -68,7 +68,7 @@
receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo)
fromSubInvCode,subInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo)
values (
#{id},
#{action},
@ -102,6 +102,7 @@
#{replicateNo},
#{invWarehouseCode},
#{fromSubInvCode},
#{subInvCode},
#{createTime},
#{originFromType},
#{invStorageCode},
@ -150,6 +151,7 @@
<if test="auditTime != null">auditTime=#{auditTime},</if>
<if test="replicateNo != null and replicateNo != ''">replicateNo=#{replicateNo},</if>
<if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
<if test="subInvCode != null and subInvCode != ''">subInvCode=#{subInvCode},</if>
<if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
<if test="originFromType != null and originFromType != ''">originFromType=#{originFromType},</if>
<if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>

4
api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
Unescape Escape View File

@ -122,8 +122,8 @@
inv_prein_product.batchNo
,inv_prein_product.productionDate,inv_prein_product.expireDate,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
inv_prein_product.inCount,inv_prein_product.outCount
,inv_prein_product.reCount,inv_prein_product.customerId,
sum(inv_prein_product.inCount) as inCount,sum(inv_prein_product.outCount) as outCount,
sum(inv_prein_product.reCount) as reCount,inv_prein_product.customerId,
basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price,inv_warehouse_sub.name invSubStorageName
,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk

5
api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
Unescape Escape View File

@ -19,9 +19,12 @@
<if test="ggxh != '' and ggxh != null">
AND inv_product.ggxh like concat('%', #{ggxh}, '%')
</if>
<if test="batchNo != '' and batchNo != null">
<if test="batchNo != '' and batchNo != null and batchNo!='empty'">
AND inv_product.batchNo like concat('%', #{batchNo}, '%')
</if>
<if test="batchNo == 'empty'">
AND inv_product.batchNo is NULL
</if>
<if test="productionDate != '' and productionDate != null">
AND inv_product.productionDate = #{productionDate}
</if>

8
api-admin/src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -4,14 +4,6 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ',
CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
INSERT ignore INTO sys_scheduled(id, cronName, cron, customerId, remark)
VALUES
(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据');
INSERT ignore INTO sys_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain )
VALUES
( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' );

Write Preview
Loading…
Cancel
Save