|
|
@@ -98,6 +98,7 @@ const stockData = ref({
|
|
|
inventoryPackaged: false,
|
|
|
carrierType:'',
|
|
|
carrierTypeName: '',
|
|
|
+ workDate:'',
|
|
|
});
|
|
|
|
|
|
const warehouseId = ref('');
|
|
|
@@ -162,10 +163,15 @@ const handleWebSocketMessage = event => {
|
|
|
if (jsonData.count) {
|
|
|
stockData.value.num = jsonData.count.toString();
|
|
|
}
|
|
|
+ if(jsonData.date){
|
|
|
+ console.log('date:' + jsonData.date);
|
|
|
+ stockData.value.workDate = jsonData.date;
|
|
|
+ }
|
|
|
|
|
|
// 使用code调用getInfo方法
|
|
|
if (jsonData.barcode) {
|
|
|
getInfo(jsonData.barcode);
|
|
|
+ queryStock(jsonData.barcode);
|
|
|
}
|
|
|
}
|
|
|
} catch (error) {
|
|
|
@@ -249,6 +255,7 @@ const clearFormData = () => {
|
|
|
inventoryPackaged: false,
|
|
|
carrierType:'',
|
|
|
carrierTypeName:'',
|
|
|
+ workDate: '',
|
|
|
};
|
|
|
carrierType.value = [];
|
|
|
transferPositionSelector.value.clearSelected();
|
|
|
@@ -316,11 +323,40 @@ const getInfo = no => {
|
|
|
);
|
|
|
};
|
|
|
|
|
|
+const queryStock = inventoryNo => {
|
|
|
+ showFullscreenLoading();
|
|
|
+ const url = `/api/CurrentStockResource/queryByBatchNoHave?batchNo=${stockData.value.batchNo}&inventoryNo=${inventoryNo}`;
|
|
|
+ ajaxApiGet(url).then(
|
|
|
+ success => {
|
|
|
+ const { errorCode, errorMessage, datas } = success;
|
|
|
+ if (errorCode !== 0) {
|
|
|
+ showConfirmDialog({
|
|
|
+ title: '确认要入库吗?',
|
|
|
+ message: errorMessage,
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ console.log('确认');
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ console.log('取消');
|
|
|
+ clearFormData();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ hideFullscreenLoading();
|
|
|
+ },
|
|
|
+ error => {
|
|
|
+ hideFullscreenLoading();
|
|
|
+ processException(error);
|
|
|
+ },
|
|
|
+ );
|
|
|
+};
|
|
|
+
|
|
|
// 提交API
|
|
|
const submitStockIn = () => {
|
|
|
const url = '/api/stockInResource/scanGeneratorStockIn';
|
|
|
const params = JSON.parse(JSON.stringify(stockData.value));
|
|
|
- delete params.workDate;
|
|
|
+ // delete params.workDate;
|
|
|
+ params.workDate = params.workDate + ' 00:00:00';
|
|
|
ajaxApiPost(url, params).then(
|
|
|
success => {
|
|
|
if (success.errorCode === 0) {
|