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

fix: 南靖初始化

Browse Source
njxyy
chenhc 11 months ago
parent 17b7bc054c
commit af52e7f89c
6 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File

16
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -843,8 +843,8 @@ public class CtqyyClient extends CommonHttpClient {
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setBillType(ptxhInvResponse.getIoType());
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() );
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity());
thrInvResultResponses.add(thrInvResultResponse);
}
}
@ -919,8 +919,8 @@ public class CtqyyClient extends CommonHttpClient {
thrInvResultResponse.setBillType("SC71090077430919");
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount("1");
thrInvResultResponse.setReCount("1");
thrInvResultResponse.setOutCount(1);
thrInvResultResponse.setReCount(1);
String barCode = ptxhInvResponse.getBarcode();
if (!barCode.contains(ptxhInvResponse.getDictBarcode())) {
@ -941,8 +941,8 @@ public class CtqyyClient extends CommonHttpClient {
for (ThrInvResultResponse thrInvResultResponse : thrInvResultResponses) {
mapArry.merge(thrInvResultResponse.getUdiCode(), thrInvResultResponse, (existingValue, newValue) -> {
// Assuming reCount can be directly handled as an integer to avoid String to Integer conversions
int updatedReCount = Integer.parseInt(existingValue.getReCount()) + Integer.parseInt(newValue.getReCount());
existingValue.setReCount(String.valueOf(updatedReCount));
int updatedReCount = existingValue.getReCount() + newValue.getReCount();
existingValue.setReCount(updatedReCount);
existingValue.setOutCount(existingValue.getReCount());
return existingValue;
});
@ -998,8 +998,8 @@ public class CtqyyClient extends CommonHttpClient {
thrInvResultResponse.setThrCode(ptxhInvResponse.getItemCode());
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity());
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity());
thrInvResultResponses.add(thrInvResultResponse);
if (seenNames.add(ptxhInvResponse.getItemCode())) {
itemData.add(ptxhInvResponse);

29
src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java
Unescape Escape View File

@ -781,23 +781,34 @@ public class NjxyyClient extends CommonHttpClient {
thrInvResultResponse.setMeasname(ptxhInvResponse.getMeasname());
thrInvResultResponse.setPrice(ptxhInvResponse.getPrice());
thrInvResultResponse.setAmount(ptxhInvResponse.getAmount());
// thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName());
// thrInvResultResponse.setDeptCode(ptxhInvResponse.getDebit());
// thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName());
// thrInvResultResponse.setInvCode(ptxhInvResponse.getCredit());
thrInvResultResponse.setSickerCode(ptxhInvResponse.getCorpid());
thrInvResultResponse.setSickerName(ptxhInvResponse.getCorpname());
thrInvResultResponse.setDeptName(ptxhInvResponse.getCorpname());
thrInvResultResponse.setDeptCode(ptxhInvResponse.getCorpid());
thrInvResultResponse.setDeptName(ptxhInvResponse.getInvname());
thrInvResultResponse.setDeptCode(ptxhInvResponse.getInvcode());
thrInvResultResponse.setInvName(ptxhInvResponse.getInvname());
thrInvResultResponse.setInvCode(ptxhInvResponse.getInvcode());
thrInvResultResponse.setManufacturer(ptxhInvResponse.getManufacturer());
thrInvResultResponse.setManufactoryCode(ptxhInvResponse.getManufactorycode());
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setBillType(ptxhInvResponse.getInouttype());
if (ptxhInvResponse.getRecount() >= 0){
thrInvResultResponse.setBillType("OUT"); //收费出库
thrInvResultResponse.setInCount(0);
thrInvResultResponse.setOutCount(ptxhInvResponse.getRecount());
thrInvResultResponse.setReCount(ptxhInvResponse.getRecount());
}else {
thrInvResultResponse.setBillType("IN"); //退费入库
thrInvResultResponse.setInCount(-ptxhInvResponse.getRecount());
thrInvResultResponse.setOutCount(0);
thrInvResultResponse.setReCount(-ptxhInvResponse.getRecount());
}
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount(ptxhInvResponse.getRecount() + "");
thrInvResultResponse.setReCount(ptxhInvResponse.getRecount() + "");
thrInvResultResponse.setChargeTime(ptxhInvResponse.getRemark1());
thrInvResultResponse.setChargeUser("系统默认操作");
thrInvResultResponses.add(thrInvResultResponse);
}
}

16
src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
Unescape Escape View File

@ -836,8 +836,8 @@ public class ScpwxyyClient extends CommonHttpClient {
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setBillType(ptxhInvResponse.getIoType());
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() );
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity());
thrInvResultResponses.add(thrInvResultResponse);
}
}
@ -907,8 +907,8 @@ public class ScpwxyyClient extends CommonHttpClient {
thrInvResultResponse.setBillType("SC71090077430919");
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount("1");
thrInvResultResponse.setReCount("1");
thrInvResultResponse.setOutCount(1);
thrInvResultResponse.setReCount(1);
IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, ptxhInvResponse.getBarcode()).last("limit 1"));
if (codeEntity == null) {
codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1"));
@ -923,8 +923,8 @@ public class ScpwxyyClient extends CommonHttpClient {
for (ThrInvResultResponse thrInvResultResponse : thrInvResultResponses) {
mapArry.merge(thrInvResultResponse.getUdiCode(), thrInvResultResponse, (existingValue, newValue) -> {
// Assuming reCount can be directly handled as an integer to avoid String to Integer conversions
int updatedReCount = Integer.parseInt(existingValue.getReCount()) + Integer.parseInt(newValue.getReCount());
existingValue.setReCount(String.valueOf(updatedReCount));
int updatedReCount =existingValue.getReCount() + newValue.getReCount();
existingValue.setReCount(updatedReCount);
existingValue.setOutCount(existingValue.getReCount());
return existingValue;
});
@ -986,8 +986,8 @@ public class ScpwxyyClient extends CommonHttpClient {
thrInvResultResponse.setThrCode(ptxhInvResponse.getItemCode());
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() );
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity());
thrInvResultResponses.add(thrInvResultResponse);
if (seenNames.add(ptxhInvResponse.getItemCode())) {
itemData.add(ptxhInvResponse);

16
src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java
Unescape Escape View File

@ -829,8 +829,8 @@ public class YxfyyyClient extends CommonHttpClient {
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setBillType(ptxhInvResponse.getIoType());
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() );
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() );
thrInvResultResponses.add(thrInvResultResponse);
}
}
@ -900,8 +900,8 @@ public class YxfyyyClient extends CommonHttpClient {
thrInvResultResponse.setBillType("SC71090077430919");
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount("1");
thrInvResultResponse.setReCount("1");
thrInvResultResponse.setOutCount(1);
thrInvResultResponse.setReCount(1);
IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, ptxhInvResponse.getBarcode()).last("limit 1"));
if (codeEntity == null) {
codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1"));
@ -916,8 +916,8 @@ public class YxfyyyClient extends CommonHttpClient {
for (ThrInvResultResponse thrInvResultResponse : thrInvResultResponses) {
mapArry.merge(thrInvResultResponse.getUdiCode(), thrInvResultResponse, (existingValue, newValue) -> {
// Assuming reCount can be directly handled as an integer to avoid String to Integer conversions
int updatedReCount = Integer.parseInt(existingValue.getReCount()) + Integer.parseInt(newValue.getReCount());
existingValue.setReCount(String.valueOf(updatedReCount));
int updatedReCount = existingValue.getReCount() + newValue.getReCount();
existingValue.setReCount(updatedReCount);
existingValue.setOutCount(existingValue.getReCount());
return existingValue;
});
@ -979,8 +979,8 @@ public class YxfyyyClient extends CommonHttpClient {
thrInvResultResponse.setThrCode(ptxhInvResponse.getItemCode());
thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
thrInvResultResponse.setType("1");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity());
thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() );
thrInvResultResponses.add(thrInvResultResponse);
if (seenNames.add(ptxhInvResponse.getItemCode())) {
itemData.add(ptxhInvResponse);

2
src/main/java/com/glxp/mipsdl/res/ptxhyy/PtxhInvResponse.java
Unescape Escape View File

@ -12,7 +12,7 @@ public class PtxhInvResponse {
@TableField("ZXKS")
private String zxks;
@TableField("ZSL")
private String zsl;
private Integer zsl;
@TableField("FYXH")
private String fyxh;
@TableField("DW")

9
src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java
Unescape Escape View File

@ -70,12 +70,12 @@ public class ThrInvResultResponse {
/**
* 入库数量
*/
private String inCount;
private Integer inCount;
/**
* 出库数量
*/
private String outCount;
private Integer outCount;
/**
* 供应商
@ -140,11 +140,8 @@ public class ThrInvResultResponse {
/**
* 实际数量
*/
private String reCount;
private Integer reCount;
public int getCount() {
return Integer.valueOf(reCount);
}
/**
* 数据类型：住院、门诊等

Write Preview
Loading…
Cancel
Save