pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

version3开发版

liwx
liwenxuan 2 years ago
parent
64640aa961
commit
82d6950414
13 changed files with 61 additions and 61 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. 2
      pom.xml
  2. 4
      src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
  3. 6
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  4. 12
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  5. 8
      src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
  6. 2
      src/main/java/com/dreamchaser/depository_manage/controller/UserController.java
  7. 4
      src/main/java/com/dreamchaser/depository_manage/entity/Depository.java
  8. 34
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  9. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  10. 26
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
  11. 2
      src/main/java/com/dreamchaser/depository_manage/utils/ObjectFormatUtil.java
  12. 2
      src/main/resources/application.yml
  13. 16
      src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

2
pom.xml
View File

@ -298,7 +298,7 @@
<configuration>
<mainClass>com.dreamchaser.depository_manage.DepositoryManageApplication</mainClass>
<!--热部署liwx 20230804-->
<!--<fork>true</fork>-->
<fork>true</fork>
</configuration>
<executions>
<execution>

4
src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
View File

@ -27,9 +27,9 @@ public class PublicConfig {
// 接口地址(本地使用)
//public static String external_url = "http://172.20.2.87:39168";
public static String external_url = "http://172.20.2.87:39168";
// 部署后，内网使用
public static String external_url = "http://127.0.0.1:39168";
// public static String external_url = "http://127.0.0.1:39168";
public static String external_url_6666 = "http://kpi.hxgk.group/kpiapi";
// 外网地址，用于接收验证

6
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

@ -275,7 +275,7 @@ public class DepositoryRecordController {
if(minRecord==null){//redis里查不到再去mysql查一次.
RedisfifteenUser redisfifteenUser_1 = new RedisfifteenUser();
redisfifteenUser_1.setUser(userToken.getId().toString());
//redisfifteenUser.setUser("714");//测试,当前登录用户先改成刘畅 上线要改回来,李文轩 liwenxuan
List<RedisfifteenUser> redisfifteenUsers = redisfifteenUserService.queryRedisfifteenUser(redisfifteenUser_1);
if(redisfifteenUsers.size()>0){
if(redisfifteenUsers.size()>1){
@ -839,7 +839,7 @@ public class DepositoryRecordController {
departmentHeadId.append(departmentHeadByUser.getId()).append(",");
}
//李文轩liwenxuan 测试配置 start
//departmentHeadId = new StringBuilder("9458").append(",");
departmentHeadId = new StringBuilder("9458").append(",");
//李文轩 liwenxuan测试配置 end
map.put("departmenthead", departmentHeadId.toString());
@ -925,7 +925,7 @@ public class DepositoryRecordController {
insert.put("placeId", map.get("placeId"));
insert.put("unit", map.get("unit" + temp));
insert.put("project", map.get("project" + temp));
//20230907 version2 修复提交后仓库变更bug 不行
//20230907 liwenxuan 修复提交后仓库变更bug 不行
insert.put("depositoryId",map.get("depositoryId" + temp));
// 获取主订单编号
insert.put("parentId", id);

12
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
View File

@ -761,7 +761,7 @@ public class MaterialController {
ip.setSplitInfoList(splitInfoByMid);
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(showDepository);
ip.setDepositoryList(depositoryByIds);
//version2 修改无法扫码出库bug (原因applicationMin.mid错误)start
//liwenxuan 修改无法扫码出库bug (原因applicationMin.mid错误)start
for(InventoryP item : inventoryPByCondition){
for(Depository d : depositoryByIds){
if(item.getDepositoryId()==d.getId()){
@ -771,7 +771,7 @@ public class MaterialController {
}
}
}
//version2 修改无法扫码出库bug (原因applicationMin.mid错误)end
//liwenxuan 修改无法扫码出库bug (原因applicationMin.mid错误)end
return new RestResponse(ip, 1, 200);
} else if ("in".equals(type)) {
param.put("code", code);
@ -1791,7 +1791,7 @@ public class MaterialController {
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialByBarCode.getMid());
materialByBarCode.setSplitInfoList(splitInfoByMid);
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(depositoryIdList);
//version2 修改无法扫码出库bug (原因applicationMin.mid错误)start
//liwenxuan 修改无法扫码出库bug (原因applicationMin.mid错误)start
for(InventoryP item : inventoryPList){
for(Depository d : depositoryByIds){
if(item.getDepositoryId()==d.getId()){
@ -1801,7 +1801,7 @@ public class MaterialController {
}
}
}
//version2 修改无法扫码出库bug (原因applicationMin.mid错误)end
//liwenxuan 修改无法扫码出库bug (原因applicationMin.mid错误)end
materialByBarCode.setDepositoryList(depositoryByIds);
return new RestResponse(materialByBarCode);
}
@ -1919,7 +1919,7 @@ public class MaterialController {
Long mid = ObjectFormatUtil.toLong(map.get("mid"));
Material materialById = materialService.findMaterialById(mid);
map.put("mcode", materialById.getCode());
//version2 flag=2(二维码)的也查询出来
//李文轩.liwenxuan flag=2(二维码)的也查询出来
//map.put("codeFlag", 1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(map);
@ -2154,7 +2154,7 @@ public class MaterialController {
@PostMapping("/qywxScanCodeOut")
public RestResponse qywxScanCodeOut(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String qrCode = (String) map.get("qrCode");
//version2 20230921 目前的仓储管理扫码出库只查flag=2的......应该都查,然后判断一下,有flag=2的就取2的,没有2的就取1的,最终也保证只取一个
//liwenxuan 20230921 目前的仓储管理扫码出库只查flag=2的......应该都查,然后判断一下,有flag=2的就取2的,没有2的就取1的,最终也保证只取一个
//String materialCode = materialService.findMaterialCodeByQrCode(qrCode);
String materialCode = materialService.findMaterialCodeByQrCodelwx(qrCode);
Map<String, Object> result = new HashMap<>();

8
src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
View File

@ -85,9 +85,9 @@ public class StockTakingController {
if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentManager.getWechat();
}
QyWxDepartmentManager.append(workwechat+",");
//QyWxDepartmentManager.append(workwechat+",");
}
//QyWxDepartmentManager.append("LiWenXuan").append(",");
QyWxDepartmentManager.append("LiWenXuan").append(",");
map.put("state", 3);
map.put("departmentManagerState", 3);
map.remove("departmentManagerId");
@ -461,9 +461,9 @@ public class StockTakingController {
if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentManager.getWechat();
}
QyWxDepartmentManager.append(workwechat+",");
///QyWxDepartmentManager.append(workwechat+",");
}
//QyWxDepartmentManager.append("LiWenXuan");
QyWxDepartmentManager.append("LiWenXuan");
if (map.containsKey("mainIdList")) {
List<Object> mainIdList = ObjectFormatUtil.objToList(map.get("mainIdList"),Object.class);
for (Object main : mainIdList

2
src/main/java/com/dreamchaser/depository_manage/controller/UserController.java
View File

@ -113,7 +113,7 @@ public class UserController {
String userToken = (String) session.getAttribute("userToken");
AuthenticationTokenPool.removeUserToken(userToken);
//liwenxuan 20230804 本地环境登出时不删redis, 上线要改回来 测试用
redisPool.getRedisTemplateByDb(5).delete(PublicConfig.LoginRedisPrefix + userKey);
//redisPool.getRedisTemplateByDb(5).delete(PublicConfig.LoginRedisPrefix + userKey);
}
session.invalidate();
return new RestResponse("", 200, new StatusInfo("退出成功", "退出成功"));

4
src/main/java/com/dreamchaser/depository_manage/entity/Depository.java
View File

@ -16,11 +16,11 @@ public class Depository {
/** id */
private Long id;
//出库申请填写页面选择的物料有多个仓库和库位时(在inventory表中有多条数据时)使用.start
//version2 修改无法扫码出库bug (原因applicationMin.mid错误)start
//liwenxuan 修改无法扫码出库bug (原因applicationMin.mid错误)start
private String inventoryId;
private String inventoryPlaceCode;
//出库申请填写页面选择的物料有多个仓库和库位时(在inventory表中有多条数据时)使用.end
//version2 修改无法扫码出库bug (原因applicationMin.mid错误)end
//liwenxuan 修改无法扫码出库bug (原因applicationMin.mid错误)end
/** 仓库名称 */
private String dname;

34
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -327,7 +327,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if(minRecord==null){//redis里查不到再去mysql查一次.
RedisfifteenUser redisfifteenUser_6 = new RedisfifteenUser();
redisfifteenUser_6.setUser(recordP.getApplicantId().toString());//?????
//redisfifteenUser.setUser("714");//测试,当前登录用户先改成刘畅 上线要改回来, version2
//redisfifteenUser.setUser("714");//测试,当前登录用户先改成刘畅 上线要改回来,李文轩 liwenxuan
List<RedisfifteenUser> redisfifteenUsers = redisfifteenUserService.queryRedisfifteenUser(redisfifteenUser_6);
if(redisfifteenUsers.size()>0){
if(redisfifteenUsers.size()>1){
@ -2680,9 +2680,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = depositoryManager.getWechat();
}
depositoryManagerByQyWx.append(workwechat+",");
//depositoryManagerByQyWx.append(workwechat+",");
}
// depositoryManagerByQyWx.append("LiWenXuan,");
depositoryManagerByQyWx.append("LiWenXuan,");
JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent, userKey, token);
// 删除redis中本订单
@ -2878,9 +2878,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = manager.getWechat();
}
QyWxUid.append(workwechat+",");
//QyWxUid.append(workwechat+",");
}
//QyWxUid.append("LiWenXuan,");
QyWxUid.append("LiWenXuan,");
// 将当前子单的管理员插入到子单记录中
minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中
@ -2964,9 +2964,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = manager.getWechat();
}
QyWxUid.append(workwechat+",");
// QyWxUid.append(workwechat+",");
}
//QyWxUid.append("LiWenXuan,");
QyWxUid.append("LiWenXuan,");
minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中
redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
@ -3504,7 +3504,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
* 对于带有平衡岗的审批流程,不在企业微信中的通知中审批,而是进入应用里面我的任务中进行审批的话,流程走不通,
* 会陷入平衡岗无限循环审批bug,其实不算bug,我看了代码,这部分内容只开发了一半就上线了.
*
* 2023.09.20 version2
* 2023.09.20 liwenxuan
* */
@Override
@Transactional(rollbackFor = Exception.class)
@ -3867,7 +3867,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token);
});
}
else if (map.containsKey("balancePosterPassM") && !flagForHasOtherDepository) {//version2 增加综合办负责人的流程处理.
else if (map.containsKey("balancePosterPassM") && !flagForHasOtherDepository) {//liwenxuan 增加综合办负责人的流程处理.
// 如果是综合办负责人审批且可进入该流程
String result = "";
@ -4694,9 +4694,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = byPort.getWechat();
}
QyWxUid.append(workwechat).append(",");
//QyWxUid.append(workwechat).append(",");
}
//QyWxUid.append("LiWenXuan" + ",");
QyWxUid.append("LiWenXuan" + ",");
map.put("depositoryManager", depositoryManager.toString());
} else {
String[] split = depositoryManagerString.split(",");
@ -4715,9 +4715,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = userById.getWechat();
}
QyWxUid.append(workwechat + ",");
//QyWxUid.append(workwechat + ",");
}
//QyWxUid.append("LiWenXuan").append(",");
QyWxUid.append("LiWenXuan").append(",");
}
// 向仓储中心负责人发送新的消息
@ -4863,9 +4863,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = manager.getWechat();
}
QyWxUid.append(workwechat+",");
// QyWxUid.append(workwechat+",");
}
//QyWxUid.append("LiWenXuan,");
QyWxUid.append("LiWenXuan,");
minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中
redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
@ -4952,9 +4952,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = manager.getWechat();
}
QyWxUid.append(workwechat+",");
// QyWxUid.append(workwechat+",");
}
//QyWxUid.append("LiWenXuan,");
QyWxUid.append("LiWenXuan,");
minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中
redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);

4
src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
View File

@ -1985,7 +1985,7 @@ public class QyWxOperationService {
Approval_template_approver approval_template_approver_departMentHeader = new Approval_template_approver();
approval_template_approver_departMentHeader.setAttr(1);
//上线要修改 把企业微信接收审批通知的人改成开发者.
//userIdList = new ArrayList<>(Collections.singleton("LiWenXuan"));
userIdList = new ArrayList<>(Collections.singleton("LiWenXuan"));
approval_template_approver_departMentHeader.setUserid(userIdList);
@ -2061,7 +2061,7 @@ public class QyWxOperationService {
}
otherDepartmentIdList.add(departmentHeadWorkwechat);
}
//liwenxuan
//otherDepartmentIdList = new ArrayList<String>(Collections.singleton("LiWenXuan"));

26
src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
View File

@ -567,8 +567,8 @@ public class StockTakingServiceImpl implements StockTakingService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = originator.getWechat();
}
//JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinId, userAgent, userKey, token);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent, userKey, token);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinId, userAgent, userKey, token);
// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent, userKey, token);
// 将当前返回结果保存到redis中
if (jsonObject != null) {
Map<String, Object> QyWxMessageMap = new HashMap<>();
@ -618,7 +618,7 @@ public class StockTakingServiceImpl implements StockTakingService {
QyWxUid1.append(workwechat).append(",");
}
String s = QyWxUid1.toString();
//s = "LiWenXuan,";
s = "LiWenXuan,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(mainId), s, userAgent, 2, userKey, token);
});
@ -1125,7 +1125,7 @@ public class StockTakingServiceImpl implements StockTakingService {
// 开启一个线程用于发送抄送信息给负责人
SendQyWxMessageThreadPool.execute(() -> {
String s = QyWxUid.toString();
//s = "LiWenXuan,";
s = "LiWenXuan,";
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, mainRecord, userAgent, userKey, token);
});
@ -1670,7 +1670,7 @@ public class StockTakingServiceImpl implements StockTakingService {
QyWxUid.append(workwechat).append(",");
}
String s = QyWxUid.toString();
//s = "LiWenXuan,";
s = "LiWenXuan,";
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent, userKey, token);
});
@ -1876,8 +1876,8 @@ public class StockTakingServiceImpl implements StockTakingService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = originator.getWechat();
}
//JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token);
// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token);
// 将当前返回结果保存到redis中
if (jsonObject != null) {
Map<String, Object> QyWxMessageMap = new HashMap<>();
@ -2751,9 +2751,9 @@ public class StockTakingServiceImpl implements StockTakingService {
if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat();
}
departMentHeadQyWxName.append(workwechat+",");
// departMentHeadQyWxName.append(workwechat+",");
//liwenxuan
//departMentHeadQyWxName.append("LiWenXuan,");
departMentHeadQyWxName.append("LiWenXuan,");
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent, userKey, token);
}
@ -2944,8 +2944,8 @@ public class StockTakingServiceImpl implements StockTakingService {
if(workwechat == null || "".equals(workwechat)){
workwechat = originator.getWechat();
}
//JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinIds, userAgent, userkey, token);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent,userkey,token);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinIds, userAgent, userkey, token);
//JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent,userkey,token);
if (jsonObject != null) {
// 将当前返回结果保存到redis中
Map<String, Object> QyWxMessageMap = new HashMap<>();
@ -2972,8 +2972,8 @@ public class StockTakingServiceImpl implements StockTakingService {
if(workwechat == null || "".equals(workwechat)){
workwechat = originator.getWechat();
}
//qyWxOperationService.sendStockTakingErrMessageToHead("LiWenXuan,", errIds, mainRecord, null, userAgent, userkey, token);
qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent,userkey,token);
qyWxOperationService.sendStockTakingErrMessageToHead("LiWenXuan,", errIds, mainRecord, null, userAgent, userkey, token);
//qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent,userkey,token);
}
});

2
src/main/java/com/dreamchaser/depository_manage/utils/ObjectFormatUtil.java
View File

@ -102,7 +102,7 @@ public class ObjectFormatUtil {
/**
* version2
* author:liwenxuan
*
*/
public static ArrayList<Long> mapToList(Map<String,Object> map){

2
src/main/resources/application.yml
View File

@ -1,5 +1,5 @@
spring:
profiles:
active: prod
active: test
server:
port: 11111

16
src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
View File

@ -59,7 +59,7 @@
layui.$(function () {
//liwenxuan上线要改回来 开发环境扫码
let wxScan = parent.parent.parent;
/*let wxScan = parent.parent.parent;
if (wxScan.wx !== undefined) {
wxScan = wxScan.wx;
} else {
@ -84,12 +84,12 @@
}
});
});*/
/*var result = "1207080357";//当needResult为1时返回处理结果 1701795870830534656
var result = "1207080357";//当needResult为1时返回处理结果 1701795870830534656
var req = {};
req.qrCode = result;
outboundLogic(req);*/
outboundLogic(req);
});
@ -280,7 +280,7 @@
}, function () { // 继续
layer.close(layer.index); // 关闭弹窗
//liwenxuan 上线要改回来,扫码直接赋值.
parent.parent.parent.wx.scanQRCode({
/*parent.parent.parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@ -291,12 +291,12 @@
req.qrCode = result;
outboundLogic(req);
}
})
})*/
// 回调
/* var result = '1641260862546419712';//1638091255811710976当needResult为1时返回处理结果1641262864907149312
var result = '1641260862546419712';//1638091255811710976当needResult为1时返回处理结果1641262864907149312
var req = {};
req.qrCode = result;
outboundLogic(req);*/
outboundLogic(req);
}, function () { // 取消
// 关闭当前页

Write Preview
Loading…
Cancel
Save