xins
/
HwJyHbMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 原材料退库传ERP接口改其他出库、原材料出库不分组传ERP、其他入库单保存加备注

Browse Source
master
yinq 7 days ago
parent b64f0dcfbc
commit 73e032c91d
5 changed files with 85 additions and 16 deletions
Show Stats Download Patch File Download Diff File

9
hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java
Unescape Escape View File

@ -610,6 +610,7 @@ public class KingdeeErpService {
Double FQty = (Double) objectParams.get("FQty");//实发数量
Double FPrice = (Double) objectParams.get("FPrice");//成本价
String FStockId = (String) objectParams.get("FStockId");//仓库
String tips = objectParams.containsKey("tips") ? (String) objectParams.get("tips") : null; //明细备注
try {
//业务对象标识
String formId = KingdeeConfig.STK_MISCELLANEOUS;
@ -636,6 +637,12 @@ public class KingdeeErpService {
JSONObject FAuxPropIdObject = new JSONObject();
FAuxPropIdObject.put("FAUXPROPID__FF100001", FAuxPropId);
FEntity.put("FAuxPropId", FAuxPropIdObject); //辅助属性
JSONObject FNumberObject = new JSONObject();
FNumberObject.put("FNumber", "001");
JSONObject FStockLocIdObject = new JSONObject();
FStockLocIdObject.put("FSTOCKLOCID__FF100002", FNumberObject);
FEntity.put("FStockLocId", FStockLocIdObject);//仓位维度
FEntity.put("FEntryNote", tips);//备注
ArrayList<JSONObject> entityList = new ArrayList<>();
entityList.add(FEntity);
@ -649,7 +656,7 @@ public class KingdeeErpService {
model.put("FOwnerTypeIdHead", "BD_OwnerOrg"); //货主类型(必填项)
model.put("FOwnerIdHead", KingdeeConfig.getFApplicationOrgId()); //货主(必填项)
JSONObject FDeptIdObject = new JSONObject();
FDeptIdObject.put("FNumber", "BM000001");
FDeptIdObject.put("FNumber", "JY000042");
model.put("FDeptId", FDeptIdObject); //部门
data.put("Model", model);
String saveParams = data.toJSONString();

51
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawReturnDetail.java
Unescape Escape View File

@ -117,6 +117,57 @@ public class WmsRawReturnDetail extends BaseEntity
private String unitCode;
/**
* 源单单据内码(上游单据：单据内码)
*/
private String fsBillId;
/**
* 源单单据行内码(上游单据：单据行内码)
*/
private String fsId;
/**
* 收料单据号
*/
private String billNo;
/**
* 备注-申请原因
*/
private String tips;
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
public String getFsBillId() {
return fsBillId;
}
public void setFsBillId(String fsBillId) {
this.fsBillId = fsBillId;
}
public String getFsId() {
return fsId;
}
public void setFsId(String fsId) {
this.fsId = fsId;
}
public String getBillNo() {
return billNo;
}
public void setBillNo(String billNo) {
this.billNo = billNo;
}
public void setRawReturnDetailId(Long rawReturnDetailId)
{

6
hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsErpScheduledTaskService.java
Unescape Escape View File

@ -27,7 +27,7 @@ public interface IWmsErpScheduledTaskService {
*
* @return
*/
public Map<Long, List<WmsRawOutstockDetail>> synchronizeOtherMaterialDeliveryInformationToERP();
public Map<String, List<WmsRawOutstockDetail>> synchronizeOtherMaterialDeliveryInformationToERP();
/**
@ -35,10 +35,10 @@ public interface IWmsErpScheduledTaskService {
*
* @return
*/
public Map<Long, List<WmsRawOutstockDetail>> synchronizeReturnMaterialDeliveryInformationToERP();
public Map<String, List<WmsRawOutstockDetail>> synchronizeReturnMaterialDeliveryInformationToERP();
public int syncOutstockInformation(Map<Long, List<WmsRawOutstockDetail>> materialIdMap, Long materialId, String taskType);
public int syncOutstockInformation(Map<String, List<WmsRawOutstockDetail>> materialIdMap, String materialId, String taskType);
/**

27
hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsErpScheduledTaskServiceImpl.java
Unescape Escape View File

@ -174,14 +174,15 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi
* @return
*/
@Override
public Map<Long, List<WmsRawOutstockDetail>> synchronizeOtherMaterialDeliveryInformationToERP() {
public Map<String, List<WmsRawOutstockDetail>> synchronizeOtherMaterialDeliveryInformationToERP() {
int result = 0;
//领料
WmsRawOutstockDetail otherRawOutstockDetail = new WmsRawOutstockDetail();
otherRawOutstockDetail.setTaskTypeStr(WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_PRODUCTION_PICKING + "," + WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_PRODUCTION_INSTALL
+ "," + WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_AUTO_OUTSTOCK + "," + WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_OTHER);
List<WmsRawOutstockDetail> otherRawOutstockDetailList = wmsRawOutstockDetailMapper.selectWmsRawOutstockDetailERPNotSynchronized(otherRawOutstockDetail);
Map<Long, List<WmsRawOutstockDetail>> otherMaterialIdMap = otherRawOutstockDetailList.stream().collect(Collectors.groupingBy(WmsRawOutstockDetail::getMaterialId));
Map<String, List<WmsRawOutstockDetail>> otherMaterialIdMap =
otherRawOutstockDetailList.stream().collect(Collectors.groupingBy( detail -> detail.getRawOutstockDetailId().toString()));
return otherMaterialIdMap;
}
@ -193,14 +194,14 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi
* @return
*/
@Override
public Map<Long, List<WmsRawOutstockDetail>> synchronizeReturnMaterialDeliveryInformationToERP() {
public Map<String, List<WmsRawOutstockDetail>> synchronizeReturnMaterialDeliveryInformationToERP() {
int result = 0;
//退货出库
WmsRawOutstockDetail returnRawOutstockDetail = new WmsRawOutstockDetail();
returnRawOutstockDetail.setTaskType(WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_RETURN_OUTSTOCK);
List<WmsRawOutstockDetail> returnRawOutstockDetailList = wmsRawOutstockDetailMapper.selectWmsRawOutstockDetailERPNotSynchronized(returnRawOutstockDetail);
Map<Long, List<WmsRawOutstockDetail>> returnMaterialIdMap = returnRawOutstockDetailList.stream().collect(Collectors.groupingBy(WmsRawOutstockDetail::getMaterialId));
Map<String, List<WmsRawOutstockDetail>> returnMaterialIdMap =
returnRawOutstockDetailList.stream().collect(Collectors.groupingBy( detail -> detail.getRawOutstockDetailId().toString()));
return returnMaterialIdMap;
}
@ -208,7 +209,7 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi
@Transactional(rollbackFor = Exception.class)
@Override
public int syncOutstockInformation(Map<Long, List<WmsRawOutstockDetail>> materialIdMap, Long materialId, String taskType) {
public int syncOutstockInformation(Map<String, List<WmsRawOutstockDetail>> materialIdMap, String materialId, String taskType) {
int result = 0;
List<WmsRawOutstockDetail> wmsRawOutstockDetailList = materialIdMap.get(materialId);
JSONObject data = new JSONObject();
@ -346,15 +347,19 @@ public class WmsErpScheduledTaskServiceImpl implements IWmsErpScheduledTaskServi
data.put("FDate", fdate);
data.put("FMaterialId", rawReturnDetail.getMaterialCode());
data.put("FAuxPropId", specificationParameter);
data.put("FSrcBillNo", srcBillNo);
data.put("FUnitID", rawReturnDetail.getUnitCode());
data.put("FRealQty", FRealQty);
data.put("FQty", FRealQty);
data.put("FStockId", wmsConfig.getfStockId());
data.put("FSupplierCode", supplierCode);
data.put("FTondBase", projectNo);
data.put("tips", rawReturnDetail.getTips());
// data.put("FSrcBillNo", srcBillNo);
// data.put("FRealQty", FRealQty);
// data.put("FSupplierCode", supplierCode);
// data.put("FTondBase", projectNo);
// data.put("FSBillId", rawReturnDetail.getFsBillId());
// data.put("FSId", rawReturnDetail.getFsId());
String params = data.toJSONString();
try {
R<AjaxResult> paramsResult = remoteJindieService.savePurchaseStorage(params, SecurityConstants.INNER);
R<AjaxResult> paramsResult = remoteJindieService.saveOtherInStorage(params, SecurityConstants.INNER);
Gson gson = new Gson();
String paramsResulJson = gson.toJson(paramsResult);
log.info("+++++++++paramsResult+++++++" + paramsResulJson);

8
hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawReturnDetailMapper.xml
Unescape Escape View File

@ -34,6 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="purchaseOrderId" column="purchase_order_id" />
<result property="unitCode" column="unit_code" />
<result property="fsBillId" column="fs_bill_id" />
<result property="fsId" column="fs_id" />
<result property="billNo" column="bill_no" />
<result property="tips" column="tips" />
</resultMap>
@ -229,8 +233,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wrrd.return_amount,
wrrd.return_time,
if(wrrd.erp_amount is null, 0, wrrd.erp_amount) erp_amount,
wrrd.erp_status
wrrd.erp_status,
wrr.apply_reason tips
from wms_raw_return_detail wrrd
left join wms_raw_return wrr on wrr.raw_return_id = wrrd.raw_return_id
left join mes_base_material_info mbmi on mbmi.material_id = wrrd.material_id
left join mes_base_unit_info mbui on mbui.erp_id = mbmi.material_unit_id
left join mes_base_barcode_info mbbi on wrrd.material_barcode = mbbi.barcode_info

Write Preview
Loading…
Cancel
Save