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

修改页面及功能bug

Browse Source
zhairh
zhengmingliang 3 years ago
parent edeb5a8701
commit 14561bdbba
9 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File

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

@ -1312,30 +1312,30 @@ public class WareHouseController {
if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson))
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 + "已被用户关联，请先移除后修改！");
}
// 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 + "已被用户关联，请先移除后修改！");
// }
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
InvSubWarehouseEntity invSubWarehouseEntity =

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

@ -89,10 +89,15 @@ public class InvSubWarehouseController {
// 查询总库信息
InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
//查询仓库信息
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
filterInvWarehouseRequest.setCode(null);
if(invSubWarehouseEntity!=null){
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
filterInvWarehouseRequest.setCode(null);
}else {
return ResultVOUtils.error(999,"分库编号为空！");
}
} else {
//允许调拨

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

@ -55,6 +55,14 @@ public class SupCertSetController {
if (supCertSetEntity == null) {
supCertSetEntity = new SupCertSetEntity();
}
//判断名字存在就返回
FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest();
filterCertSetsRequest.setType(supCertSetEntity.getType());
filterCertSetsRequest.setName(supCertSetEntity.getName());
List<SupCertSetEntity> supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest);
if(supCertEntityList.size()>0){
return ResultVOUtils.error(999,"该证书名称已存在！");
}
supCertSetEntity.setUpdateTime(new Date());
if (supCertSetEntity.getType() == 3) {
@ -76,6 +84,15 @@ public class SupCertSetController {
String flbm = supCertSetEntity.getFlbmList().stream().collect(Collectors.joining(","));
supCertSetEntity.setFlbm(flbm);
}
//判断名字存在就返回
FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest();
filterCertSetsRequest.setType(supCertSetEntity.getType());
filterCertSetsRequest.setName(supCertSetEntity.getName());
List<SupCertSetEntity> supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest);
if(supCertEntityList.size()>0){
return ResultVOUtils.error(999,"该证书名称已存在！");
}
boolean b = supCertSetService.updateCertSet(supCertSetEntity);
return ResultVOUtils.success("修改成功");
}

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

@ -222,12 +222,12 @@ public class SupProductController {
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
|| (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()))
|| (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
|| supCertSetEntity.getFlbm()!=null && (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {

3
api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java
Unescape Escape View File

@ -100,5 +100,8 @@ public class PurApplyRequest extends ListPageRequest {
private String targetSubInv;
private String targetBillType;
private String startDate;
private String endDate;
}

4
api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurPlanRequest.java
Unescape Escape View File

@ -92,5 +92,9 @@ public class PurPlanRequest extends ListPageRequest {
*/
private Date createTime;
private String startDate;
private String endDate;
}

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

@ -77,11 +77,7 @@
<if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse}
</if>
<if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() >0">
<foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
auditStatus = #{auditStatus,jdbcType=VARCHAR}
</foreach>
</if>
</where>
group by basic_bussiness_type.action

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

@ -16,7 +16,12 @@
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
</if>
<if test="startDate != null and startDate !=''">
<![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d')>= #{startDate}]]>
</if>
<if test="endDate != null and endDate !=''">
<![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d') <= #{endDate}]]>
</if>
<if test="status!=null and status!=10 and status!=11">
and pur_apply.status = #{status}
</if>

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

@ -17,7 +17,12 @@
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
</if>
<if test="startDate != null and startDate !=''">
<![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d')>= #{startDate}]]>
</if>
<if test="endDate != null and endDate !=''">
<![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d') <= #{endDate}]]>
</if>
<if test="status!=null and status!=10 and status!=11">
and pur_plan.status = #{status}
</if>

Write Preview
Loading…
Cancel
Save