Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_online_20240829
lijuncheng 5 months ago
parent
commit
3b49f5be9d
  1. 2
      .env.development
  2. 2
      .env.hella13
  3. 2
      .env.hella14
  4. 2
      .env.hella15
  5. 2
      .env.hella16
  6. 2
      .env.hella8
  7. 2
      .env.hella9
  8. 10
      .env.production
  9. 2
      .env.test
  10. 4
      src/hybrid/html/point.html
  11. 2
      src/mycomponents/job/jobComMainDetailCard.vue
  12. 6
      src/mycomponents/qty/compareQty.vue
  13. 41
      src/mycomponents/scan/winComScanFg.vue
  14. 9
      src/pages/deliver/coms/comScanDeliverPack.vue
  15. 12
      src/pages/point/index.vue
  16. 29
      src/pages/productPutaway/job/productPutawayDetail.vue
  17. 4
      src/pages/productReceipt/coms/comFgCard.vue
  18. 5
      src/pages/productReceipt/job/fgProductReceiptDetail.vue

2
.env.development

@ -2,7 +2,7 @@ VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
#VITE_BASE_URL=http://172.21.32.13:81/api/admin-api #VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api #VITE_BASE_URL=http://172.21.32.13:81/api/admin-api #VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
# 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' # 租户配置 VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

2
.env.hella13

@ -2,7 +2,7 @@ VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"长春","value":1}]' VITE_TENANT='[{"text":"长春1379","value":1}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

2
.env.hella14

@ -2,7 +2,7 @@ VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"长春","value":1}]' VITE_TENANT='[{"text":"长春1379","value":1}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

2
.env.hella15

@ -2,7 +2,7 @@ VITE_BASE_URL=https://scp.faway-hella.com:81/api/admin-api
VITE_BASE_URL_IMAGE=https://scp.faway-hella.com:81/admin-api VITE_BASE_URL_IMAGE=https://scp.faway-hella.com:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"长春","value":1}]' VITE_TENANT='[{"text":"长春1379","value":1}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

2
.env.hella16

@ -2,7 +2,7 @@ VITE_BASE_URL=https://scptest.faway-hella.com:81/api/admin-api
VITE_BASE_URL_IMAGE=https://scptest.faway-hella.com:81/admin-api VITE_BASE_URL_IMAGE=https://scptest.faway-hella.com:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

2
.env.hella8

@ -2,7 +2,7 @@ VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"成都","value":2}]' VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

2
.env.hella9

@ -2,7 +2,7 @@ VITE_BASE_URL=http://172.22.32.9:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"成都","value":2}]' VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

10
.env.production

@ -1,7 +1,11 @@
VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' VITE_BASE_URL=http://172.22.32.9:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
# 租户配置
VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=false
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'

2
.env.test

@ -3,7 +3,7 @@ VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=true VITE_isDevelopment=true

4
src/hybrid/html/point.html

@ -30,6 +30,10 @@
.left-item { .left-item {
display: flex; display: flex;
} }
.bold-font{
font-weight: bold;
font-size: 28rpx;
}
.label { .label {
border-bottom: 1px solid #b1b1b1; border-bottom: 1px solid #b1b1b1;

2
src/mycomponents/job/jobComMainDetailCard.vue

@ -13,7 +13,7 @@
<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode"> <location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
</location> </location>
<!-- <to-location></to-location> --> <!-- <to-location></to-location> -->
<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.locationCode"> <to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
</to-location> </to-location>
</div> </div>
<view class="card_view " v-if="isShowDeliverType"> <view class="card_view " v-if="isShowDeliverType">

6
src/mycomponents/qty/compareQty.vue

@ -28,10 +28,10 @@
</view> </view>
</view> </view>
</view> </view>
<uom :uom="dataContent.uom"> <!-- <uom :uom="dataContent.uom">
</uom>
<!-- <uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom">
</uom> --> </uom> -->
<uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom">
</uom>
</view> </view>
<view> <view>
<pack-unit v-show="isShowPackUnit" :dataContent="dataContent"></pack-unit> <pack-unit v-show="isShowPackUnit" :dataContent="dataContent"></pack-unit>

41
src/mycomponents/scan/winComScanFg.vue

@ -188,29 +188,30 @@
getMesPackInfo(this.itemCode).then(res => { getMesPackInfo(this.itemCode).then(res => {
try { try {
if (res.data.list.length == 0) { if (res.data.list.length == 0) {
throw new Error("没有查找到物料号【"+this.itemCode+"】对应的mes物料号") throw new Error("没有查找到物料号【" + this.itemCode + "】对应的生产条码配置")
} }
var result = res.data.list[0] var result = res.data.list[0] //Mes
var partNumber = result.partNumber; var partNumber = result.partNumber; //
var lengthMat = result.lengthMat; var lengthMat = result.lengthMat;
var lengthBc = result.lengthBc; var lengthBc = result.lengthBc;
//Q5,,TypeQ5
let itemCode = content.substr(0, lengthMat); if (result.Type == 'P') {
let productDate = content.substr(lengthMat, 8); let scanPartNumber = content.substr(0, lengthMat); //
let batch = content.substr(lengthMat + 8, 3); // let productDate = content.substr(lengthMat, 8);
// let batch = content.substr(lengthMat + 8, 3);
let order = content.substr(-8); let order = content.substr(-8);
if (itemCode != partNumber) { if (scanPartNumber != partNumber) {
that.clear(); that.clear();
throw new Error("解析错误:扫描物料号【" + itemCode + "】与查询物料号【" + partNumber + throw new Error("解析错误:扫描的客户物料号【" + scanPartNumber +
"】与生成条码配置表中的客户物料号【" + partNumber +
"】不一致") "】不一致")
} }
let scanResult = { let scanResult = {
itemCode: itemCode, itemCode: scanPartNumber,
productDate: productDate, // productDate: productDate,
batch: batch, // batch: batch,
order: order, order: order,
qty: 1, qty: 1,
content: content, content: content,
@ -218,6 +219,20 @@
}; };
that.clear(); that.clear();
that.$emit("getResult", scanResult); that.$emit("getResult", scanResult);
} else {
//,
let scanResult = {
itemCode: this.itemCode,
// productDate: new Date(),
// batch: new Date(),
order: 0,
qty: 1,
content: content,
success: true,
};
that.clear();
that.$emit("getResult", scanResult);
}
} catch (error) { } catch (error) {
this.$refs.comMessage.showErrorMessage(error.message, res => { this.$refs.comMessage.showErrorMessage(error.message, res => {
if (res) { if (res) {

9
src/pages/deliver/coms/comScanDeliverPack.vue

@ -388,6 +388,11 @@
packingNumber:data.packingNumber, packingNumber:data.packingNumber,
qty: 0, qty: 0,
uom:data.uom, uom:data.uom,
itemName:packageInfo.itemName,
itemDesc1:packageInfo.itemDesc1,
itemDesc2:packageInfo.itemDesc2,
singlePrice:balance.singlePrice,
amount:balance.amount
} }
} }
let record = this.creatRecord(data, balance, packageInfo); let record = this.creatRecord(data, balance, packageInfo);
@ -410,7 +415,9 @@
toLocationCode: this.toLocationCode, toLocationCode: this.toLocationCode,
supplierCode: label.supplierCode, supplierCode: label.supplierCode,
packUnit: packageInfo.packUnit, packUnit: packageInfo.packUnit,
packQty: packageInfo.packQty packQty: packageInfo.packQty,
singlePrice:balance.singlePrice,
amount:balance.amount
} }
return record; return record;
}, },

12
src/pages/point/index.vue

@ -5,7 +5,7 @@
<view class="left"> <view class="left">
<view class="left-item"> <view class="left-item">
<view class="label">物品代码</view> <view class="label">物品代码</view>
<view class="value" id="name1">{{item.itemCode}}</view> <view class="value bold-font" id="name1">{{item.itemCode}}</view>
</view> </view>
<view class="left-item"> <view class="left-item">
<view class="label">物品名称</view> <view class="label">物品名称</view>
@ -29,7 +29,7 @@
</view> </view>
<view class="left-item"> <view class="left-item">
<view class="label">数量</view> <view class="label">数量</view>
<view class="value">{{item.qty}}</view> <view class="value bold-font">{{item.qty}}</view>
</view> </view>
</view> </view>
@ -119,7 +119,7 @@
<div class="left"> <div class="left">
<div class="left-item"> <div class="left-item">
<div class="label">物品代码</div> <div class="label">物品代码</div>
<div class="value" id="name1">${item.itemCode}</div> <div class="value bold-font" id="name1">${item.itemCode}</div>
</div> </div>
<div class="left-item"> <div class="left-item">
<div class="label">物品名称</div> <div class="label">物品名称</div>
@ -143,7 +143,7 @@
</div> </div>
<div class="left-item"> <div class="left-item">
<div class="label">数量</div> <div class="label">数量</div>
<div class="value">${item.qty}</div> <div class="value bold-font">${item.qty}</div>
</div> </div>
</div> </div>
<div class="right"> <div class="right">
@ -254,6 +254,10 @@
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
} }
.bold-font{
font-weight: bold;
font-size: 28rpx;
}
.value { .value {
border-bottom: 1px solid #b1b1b1; border-bottom: 1px solid #b1b1b1;

29
src/pages/productPutaway/job/productPutawayDetail.vue

@ -333,41 +333,26 @@
.fromLocationCode + "】已经扫描") .fromLocationCode + "】已经扫描")
} else { } else {
this.addDetail(itemDetail, result); // this.addDetail(itemDetail, result);
return; // return;
// //
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if (this.jobContent.allowModifyInventoryStatus == "TRUE") { // if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
this.addDetail(itemDetail, result); this.addDetail(itemDetail, result);
// itemDetail.scaned = true;
// itemDetail.handleQty = Number(result.balance.qty)
// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
// itemDetail.balance = result.balance;
// itemDetail.balance.balanceQty = Number(result.balance.qty)
// itemDetail.balance.packQty = Number(result.package.packQty)
// itemDetail.balance.packUnit = result.package.packUnit
// this.calcHandleQty();
} else { } else {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} }
}); });
} }
} else { // } else {
this.addDetail(itemDetail, result); // this.addDetail(itemDetail, result);
// itemDetail.scaned = true; // }
// itemDetail.handleQty = Number(result.balance.qty)
// itemDetail.balance = result.balance;
// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
// itemDetail.balance.balanceQty = Number(result.balance.qty)
// itemDetail.balance.packQty = Number(result.package.packQty)
// itemDetail.balance.packUnit = result.package.packUnit
// this.calcHandleQty();
}
} }
} }
} }

4
src/pages/productReceipt/coms/comFgCard.vue

@ -7,10 +7,10 @@
<text class="card_item_code card_content ">零件号</text> <text class="card_item_code card_content ">零件号</text>
<text class="card_content ">{{detail.itemCode}}</text> <text class="card_content ">{{detail.itemCode}}</text>
</view> </view>
<view> <!-- <view>
<text class="card_product_date card_content ">生产日期</text> <text class="card_product_date card_content ">生产日期</text>
<text class="card_content ">{{detail.productDate}}</text> <text class="card_content ">{{detail.productDate}}</text>
</view> </view> -->
<!-- <view> <!-- <view>
<text class="card_batch card_content ">批次</text> <text class="card_batch card_content ">批次</text>

5
src/pages/productReceipt/job/fgProductReceiptDetail.vue

@ -273,7 +273,7 @@
} else { } else {
var itemIndex = subItem.fgList.findIndex(r => var itemIndex = subItem.fgList.findIndex(r =>
r.itemCode == result.itemCode && r.itemCode == result.itemCode &&
r.productDate == result.productDate && // r.productDate == result.productDate &&
r.order == result.order); r.order == result.order);
if (itemIndex == -1) { if (itemIndex == -1) {
subItem.fgList.push(result); subItem.fgList.push(result);
@ -525,7 +525,8 @@
if (detail.fgList) { if (detail.fgList) {
detail.fgList.forEach(res => { detail.fgList.forEach(res => {
res.outsideItemCode = res.itemCode res.outsideItemCode = res.itemCode
res.outsideProduceDate = res.productDate // res.outsideProduceDate = res.productDate
res.outsideProduceDate = null
res.outsideSerialNumber = res.order res.outsideSerialNumber = res.order
}) })
}else { }else {

Loading…
Cancel
Save