zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库部分和接口

Browse Source
This commit is contained in:
张怡蓉
2026-01-27 17:31:05 +08:00
parent 407b1f08b5
commit 0ffe411dba
12 changed files with 247 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
View File

@@ -41,4 +41,8 @@ public class DeliveryNoticeItemVo {
private String quantity;
/** 备注 */
private String remark;
private String area;
private String location;
}

19
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -12,7 +12,9 @@ import com.ruoyi.in.erp.domain.TransferBillCallback;
import com.ruoyi.in.erp.service.ITransferBillCallbackService;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockin.service.IInStockinService;
import com.ruoyi.in.stockinback.domain.InStockinBack;
import com.ruoyi.in.stockinback.service.IInStockinBackService;
import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
import com.ruoyi.in.stockindeatilback.service.IInStockinDetailBackService;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
@@ -300,11 +302,8 @@ public class ToErpServiceImpl implements IToErpService {
@Override
public void callbackInDeliveryNotice() {
InStockin inStockin = null;
// inStockin = inStockinService.selectInStockinByStockinId(billNo);
String billNo="";
InStockinBack inStockin = inStockinBackService.selectTopInStockin();
DeliveryNoticeVo deliveryNoticeVo = new DeliveryNoticeVo();
deliveryNoticeVo.setBillNo(inStockin.getStockinId());
deliveryNoticeVo.setNoteBillNo(inStockin.getStockinId());
@@ -321,13 +320,13 @@ public class ToErpServiceImpl implements IToErpService {
deliveryNoticeVo.setApproveMan(inStockin.getSpare4());
deliveryNoticeVo.setRemark(inStockin.getSpare5());
InStockinDetail inStockinDetailParam = new InStockinDetail();
inStockinDetailParam.setStockinId(billNo);
List<InStockinDetail> inStockinDetails = inStockinDetailService.selectInStockinDetailList(inStockinDetailParam);
InStockinDetailBack inStockinDetailParam = new InStockinDetailBack();
inStockinDetailParam.setStockinId(inStockin.getStockinId());
List<InStockinDetailBack> inStockinDetails = inStockinDetailBackService.selectInStockinDetailBackList(inStockinDetailParam);
List<DeliveryNoticeItemVo> detailList = new ArrayList<>();
if (inStockinDetails != null && !inStockinDetails.isEmpty()) {
for (InStockinDetail detail : inStockinDetails) {
for (InStockinDetailBack detail : inStockinDetails) {
DeliveryNoticeItemVo item = new DeliveryNoticeItemVo();
item.setLineNo(detail.getStockinDetailId());
item.setNotelineNo(detail.getStockinDetailId());
@@ -342,11 +341,15 @@ public class ToErpServiceImpl implements IToErpService {
item.setUpperMaterial(detail.getSpare2());
item.setTopMaterial(detail.getSpare3());
item.setRemark(detail.getRemark());
item.setArea(detail.getSpare9());
item.setLocation(detail.getSpare8());
detailList.add(item);
}
}
deliveryNoticeVo.setDetailList(detailList);
//todo 发送给erp 成功失败改状态
// return AjaxResult.success(deliveryNoticeVo);
}

18
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.ruoyi.in.stockin.service.IInStockinService;
import com.ruoyi.in.stockinback.domain.InStockinBack;
import com.ruoyi.in.stockinback.mapper.InStockinBackMapper;
import com.ruoyi.in.stockinback.service.IInStockinBackService;
import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
import com.ruoyi.in.stockindeatilback.mapper.InStockinDetailBackMapper;
import com.ruoyi.in.stockindeatilback.service.IInStockinDetailBackService;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
@@ -209,9 +210,20 @@ public class InStockinServiceImpl implements IInStockinService
}
private void insertInStockinBack(InStockin inStockin){
inStockinBackMapper.insertInStockinBackById(inStockin);
inStockinDetailBackMapper.insertInStockinDetailBackById(inStockin);
InStockin inStockin1 = selectInStockinByStockinGuid(inStockin.getStockinGuid());
InStockinBack inStockinBack = new InStockinBack();
BeanUtil.copyProperties(inStockin1,inStockinBack);
inStockinBack.setSendStatus("0");
inStockinBackMapper.insertInStockinBack(inStockinBack);
InStockinDetail inStockinDetail = new InStockinDetail();
inStockinDetail.setStockinId(inStockin1.getStockinId());
List<InStockinDetail> inStockinDetails = iInStockinDetailService.selectInStockinDetailList(inStockinDetail);
for(InStockinDetail inStockinDetail1:inStockinDetails){
InStockinDetailBack inStockinDetailBack = new InStockinDetailBack();
BeanUtil.copyProperties(inStockinDetail1,inStockinDetailBack);
inStockinDetailBack.setSendStatus("0");
inStockinDetailBackMapper.insertInStockinDetailBack(inStockinDetailBack);
}
}

32
ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java
View File

@@ -90,7 +90,37 @@ public class InStockinBack extends BaseEntity
@Excel(name = "供应商编码546")
private String supplierNo;
public void setStockinGuid(String stockinGuid)
private String sendStatus;
private String sendTime;
private String msg;
public String getSendStatus() {
return sendStatus;
}
public void setSendStatus(String sendStatus) {
this.sendStatus = sendStatus;
}
public String getSendTime() {
return sendTime;
}
public void setSendTime(String sendTime) {
this.sendTime = sendTime;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public void setStockinGuid(String stockinGuid)
{
this.stockinGuid = stockinGuid;
}

3
ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/mapper/InStockinBackMapper.java
View File

@@ -62,4 +62,7 @@ public interface InStockinBackMapper
* @return 结果
*/
public int deleteInStockinBackByStockinGuids(String[] stockinGuids);
public InStockinBack selectTopInStockin();
}

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/service/IInStockinBackService.java
View File

@@ -58,4 +58,6 @@ public interface IInStockinBackService
* @return 结果
*/
public int deleteInStockinBackByStockinGuid(String stockinGuid);
public InStockinBack selectTopInStockin();
}

5
ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/service/impl/InStockinBackServiceImpl.java
View File

@@ -90,4 +90,9 @@ public class InStockinBackServiceImpl implements IInStockinBackService
{
return inStockinBackMapper.deleteInStockinBackByStockinGuid(stockinGuid);
}
@Override
public InStockinBack selectTopInStockin() {
return inStockinBackMapper.selectTopInStockin();
}
}

32
ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java
View File

@@ -146,7 +146,37 @@ public class InStockinDetailBack extends BaseEntity
@Excel(name = "物料名称546")
private String productName;
public void setStockinDetailId(String stockinDetailId)
private String sendStatus;
private String sendTime;
private String msg;
public String getSendStatus() {
return sendStatus;
}
public void setSendStatus(String sendStatus) {
this.sendStatus = sendStatus;
}
public String getSendTime() {
return sendTime;
}
public void setSendTime(String sendTime) {
this.sendTime = sendTime;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public void setStockinDetailId(String stockinDetailId)
{
this.stockinDetailId = stockinDetailId;
}