mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

库存转移

Browse Source
This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-12-07 18:58:57 +08:00
parent 9da8e38306
commit 7cf6f14f1f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmTransferController.java
View File

@ -5,9 +5,7 @@ import javax.servlet.http.HttpServletResponse;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.wm.domain.WmStorageArea;
import com.ktg.mes.wm.domain.WmStorageLocation;
import com.ktg.mes.wm.domain.WmWarehouse;
import com.ktg.mes.wm.domain.*;
import com.ktg.mes.wm.domain.tx.TransferTxBean;
import com.ktg.mes.wm.service.*;
import org.springframework.security.access.prepost.PreAuthorize;
@ -26,7 +24,6 @@ import com.ktg.common.annotation.Log;
import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.enums.BusinessType;
import com.ktg.mes.wm.domain.WmTransfer;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.common.core.page.TableDataInfo;
@ -162,6 +159,14 @@ public class WmTransferController extends BaseController
@PutMapping("/{transferId}")
public AjaxResult execute(@PathVariable Long transferId){
WmTransfer transfer = wmTransferService.selectWmTransferByTransferId(transferId);
WmTransferLine param = new WmTransferLine();
param.setTransferId(transferId);
List<WmTransferLine> lines = wmTransferLineService.selectWmTransferLineList(param);
if(CollectionUtils.isEmpty(lines)){
return AjaxResult.error("请添加需要转移的物资！");
}
List<TransferTxBean> beans = wmTransferService.getTxBeans(transferId);
if(CollectionUtils.isEmpty(beans)){

1
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/StorageCoreServiceImpl.java
View File

@ -396,6 +396,7 @@ public class StorageCoreServiceImpl implements IStorageCoreService {
transaction_in.setMaterialStockId(null);
//设置入库相关联的出库事务ID
transaction_in.setRelatedTransactionId(transaction_out.getTransactionId());
wmTransactionService.processTransaction(transaction_in);
}
}