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

注册证号，审核人，审核时间修改

Browse Source
zhairh
anthonyywj2 3 years ago
parent 7f32d1b005
commit 2b7dd28385
8 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File

6
api-admin/pom.xml
Unescape Escape View File

@ -351,9 +351,9 @@
<profiles.active>pro</profiles.active>
</properties>
<!--是否默认，默认打包开发环境配置-->
<!-- <activation>-->
<!-- <activeByDefault>true</activeByDefault>-->
<!-- </activation>-->
<!-- <activation>-->
<!-- <activeByDefault>true</activeByDefault>-->
<!-- </activation>-->
</profile>
<profile>
<!--开发-->

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

@ -369,7 +369,7 @@ public class OrderController {
} else {
if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
if (StrUtil.isEmpty(entrustReceEntity.getAction())) {
if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
transferOrder(orderEntity, entrustReceEntity);
}
}

5
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
Unescape Escape View File

@ -335,7 +335,10 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate());
stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory());
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh()))
stockOrderDetailEntity.setZczbhhzbapzbh(stockOrderIdsRequest.getZczbhhzbapzbh());
else
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch());
stockOrderDetailEntity.setSupId(stockSelectDataEntity.getSupId());
if (StrUtil.isNotEmpty(udiInfoEntity.getPrice())) {

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

@ -1313,29 +1313,29 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
List<BussinessTypResponse> bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class);
// FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
// filterInvBusUserRequest.setSubInvCode(code);
// List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
// Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
// for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
// boolean isExit = false;
// for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
// if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
// isExit = true;
// continue;
// }
// }
// if (!isExit) {
// filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
// }
// }
// if (filteBusTypes.size() > 0) {
// String data = "";
// for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
// data = data + invBusUserResponse.getBillTypeName() + ",";
// }
// return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！");
// }
FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
filterInvBusUserRequest.setSubInvCode(code);
List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
boolean isExit = false;
for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
isExit = true;
continue;
}
}
if (!isExit) {
filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
}
}
if (filteBusTypes.size() > 0) {
String data = "";
for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
data = data + invBusUserResponse.getBillTypeName() + ",";
}
return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！");
}
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
InvSubWarehouseEntity invSubWarehouseEntity =

1
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
Unescape Escape View File

@ -118,7 +118,6 @@ public class SupProductController {
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))

2
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java
Unescape Escape View File

@ -52,4 +52,6 @@ public class StockOrderEntity {
private String deptName;
private String remark;
private String reviewUserName;
}

2
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
Unescape Escape View File

@ -71,6 +71,8 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String thrSpec;
private String thrRegisterNo;
private String thrManufactory;
private String auditTime;
private String reviewUserName;
}

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

@ -107,7 +107,8 @@
<select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
SELECT stock_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bustype_local.name
billTypeName,iws2.name fromSubInvName,auth_dept.name deptName FROM stock_order
billTypeName,iws2.name fromSubInvName,auth_dept.name deptName,auth_user.employeeName reviewUserName FROM
stock_order
left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON stock_order.locStorageCode = inv_warehouse.`code`
@ -115,6 +116,7 @@
LEFT JOIN inv_warehouse_sub iws2 ON stock_order.fromSubInvCode = iws2.`code`
LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
left join auth_dept on stock_order.dept =auth_dept.code
left join auth_user on stock_order.reviewUser = auth_user.id
<where>
<if test="id != '' and id!=null">
and stock_order.id =#{id}
@ -286,7 +288,7 @@
<select id="listOrderPrint" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.StockOrderPrintEntity">
SELECT stock_order.*, stock_order.remark orderRemark,stock_order_detail.productId,
stock_order_detail.productName,
stock_order_detail.productName,auth_user.employeeName reviewUserName,
stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
@ -306,6 +308,7 @@
left JOIN basic_products on basic_products.uuid = basic_udirel.uuid
left join auth_dept on stock_order.dept = auth_dept.`code`
left join thr_products on basic_udirel.mainId = thr_products.`code`
left join auth_user on stock_order.reviewUser = auth_user.id
<where>
<if test="id != '' and id!=null">
and stock_order.id =#{id}

Write Preview
Loading…
Cancel
Save