1

wankeda

2025-04-10 1ec6d01db71d46316aea36d864a2aabecaba7ee2

1

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/common/http.interceptor.js

@@ -1,4 +1,5 @@
let baseUrl = 'http://192.168.0.191:9291'
let baseUrl = 'http://127.0.0.1:9291'
// let baseUrl = 'http://192.168.30.240:9090'
const install = (Vue, vm) => {

    // æ­¤ä¸ºè‡ªå®šä¹‰é…ç½®å‚数，具体参数见上方说明

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/package-lock.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
{
  "name": "WIDESEAWCS_PDA",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "dependencies": {
        "sm-crypto": "^0.3.12"
      }
    },
    "node_modules/jsbn": {
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
      "license": "MIT"
    },
    "node_modules/sm-crypto": {
      "version": "0.3.12",
      "resolved": "https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.12.tgz",
      "integrity": "sha512-272PBzB4PYaBdeGa41TH9ZlMGLPVRmS36Gs4FjmHwXIdihQypAbhhFWZTaa/3de69q2KfMme1M5O2W5+spAdrg==",
      "license": "MIT",
      "dependencies": {
        "jsbn": "^1.1.0"
      }
    }
  }
}

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/pages/½ÐÁÏ/Õý¼«½ÐÁÏ.vue

@@ -98,7 +98,7 @@
                    size: this.size
                };
                // ä½¿ç”¨åˆ›æ™ºå®Œæ•´æŽ¥å£
                this.$u.post('/api/PDA/AGVPage', null).then(res => {
                this.$u.post(' http://192.168.30.240:9090/makerwit/selectKHWareType', null).then(res => {
                    console.log(res);
                    this.$t.message.closeLoading();
                    cb && cb();
@@ -141,19 +141,19 @@
                    return;
                }
                let formDataParam = {
                    DTaskId: this.generateUUID(),
                    ProductCode: productCode,
                    OrderNo: orderNo,
                    Number: availableQuantity > 4 ? 4 : availableQuantity,
                    InputValue: inputValue,
                    dTaskId: this.generateUUID(),
                    productCode: productCode,
                    orderNo: orderNo,
                    number: availableQuantity > 4 ? 4 : availableQuantity,
                    inputValue: inputValue,
                    // ...其他需要传递的参数
                };
                this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
                    if (res.status) {
                        // ä½¿ç”¨åˆ›æ™ºå®Œæ•´æŽ¥å£
                        this.$u.post('/api/PDA/insertTask', formDataParam).then(res => {
                        this.$u.post('http://192.168.30.240:9090/makerwit/insertTask', formDataParam).then(res => {
                            this.$t.message.closeLoading();
                            if (res.status) {
                                    if (res.code == 200) {
                                this.$t.message.toast('呼叫成功');
                                this.$refs.popup.close();
                                // this.submit();

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/pages/½ÐÁÏ/¸º¼«½ÐÁÏ.vue

@@ -98,7 +98,7 @@
                    size: this.size
                };
                // ä½¿ç”¨åˆ›æ™ºå®Œæ•´æŽ¥å£
                this.$u.post('/api/PDA/AGVPage', null).then(res => {
                this.$u.post('http://192.168.31.240:9090/makerwit/selectKHWareType', null).then(res => {
                    console.log(res);
                    this.$t.message.closeLoading();
                    cb && cb();
@@ -141,20 +141,21 @@
                    return;
                }
                let formDataParam = {
                    DTaskId: this.generateUUID(),
                    ProductCode: productCode,
                    OrderNo: orderNo,
                    Number: availableQuantity > 4 ? 4 : availableQuantity,
                    InputValue: inputValue,
                    dTaskId: this.generateUUID(),
                    productCode: productCode,
                    orderNo: orderNo,
                    number: availableQuantity > 4 ? 4 : availableQuantity,
                    inputValue: inputValue,
                    // ...其他需要传递的参数
                };
				

                // ä½¿ç”¨åˆ›æ™ºå®Œæ•´æŽ¥å£
                this.$u.post('/api/PDA/insertTask', formDataParam).then(res => {
                this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
                    if (res.status) {
                        this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
                        this.$u.post('http://192.168.31.240:9090/makerwit/insertTask', formDataParam).then(res => {
                            this.$t.message.closeLoading();
                            if (res.status) {
                            console.log(formDataParam);
                            if (res.code == 200) {
                                this.$t.message.toast('呼叫成功');
                                this.$refs.popup.close();
                                // this.submit();

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/smCrypto.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
/**
 *  Copyright [2022] [https://www.xiaonuo.vip]
 *    Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
 *    1.请不要删除和修改根目录下的LICENSE文件。
 *    2.请不要删除和修改Snowy源码头部的版权声明。
 *    3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
 *    4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
 *    5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
 *    6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
 */
/**
 * åŠ è§£å¯†çš„工具类
 * ä½¿ç”¨ï¼šhttps://github.com/JuneAndGreen/sm-crypto
 *
 * @author yubaoshan
 */
import smCrypto from 'sm-crypto'

const sm2 = smCrypto.sm2

const cipherMode = 0 // 1 - C1C3C2，0 - C1C2C3，默认为1
const publicKey =
    '04BD62406DF6789B1FBE8C457AECAE6D7C806CDB39316F190519905C24DF395E8952C47798D76ADECF8CA28C935702AFCDD9B17DE77121FA6448F0EDEFBD8365D6'

/**
 * å›½å¯†åŠ è§£å¯†å·¥å…·ç±»
 */
export default {
    // SM2加密
    doSm2Encrypt(msgString) {
        return sm2.doEncrypt(msgString, publicKey, cipherMode)
    },
    // SM2数组加密
    doSm2ArrayEncrypt(msgString) {
        return sm2.doEncrypt(msgString, publicKey, cipherMode)
    }
}

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/yarn.lock

@@ -4,12 +4,12 @@

jsbn@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
  resolved "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz"
  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==

sm-crypto@^0.3.12:
  version "0.3.12"
  resolved "https://registry.yarnpkg.com/sm-crypto/-/sm-crypto-0.3.12.tgz#c23ec52b5f8a23b2fc4e7467f5738a90cee7b0d2"
  resolved "https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.12.tgz"
  integrity sha512-272PBzB4PYaBdeGa41TH9ZlMGLPVRmS36Gs4FjmHwXIdihQypAbhhFWZTaa/3de69q2KfMme1M5O2W5+spAdrg==
  dependencies:
    jsbn "^1.1.0"

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs

@@ -39,9 +39,9 @@
        }

        [HttpPost, Route("AddCZTask"), AllowAnonymous]
        public WebResponseContent AddCZTask([FromBody] CZTaskDto czTaskDto)
        public Task<WebResponseContent> AddCZTask([FromBody] CZTaskDto czTaskDto)
        {
            return WebResponseContent.Instance.OK();
            return _taskCZService.AddTaskCZAsync(czTaskDto);
        }
    }
}

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -18,7 +18,7 @@
    "DBType": "SqlServer",
    //连接字符串
    //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
    "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_GanFengLiYeNew;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
    "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_GanFengLiYeNew;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",

    //跨域
    "Cors": {

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs

@@ -49,13 +49,13 @@
                var taskModel = new DtCZTask()
                {
                    TaskTaskID = dto.DTaskId,
                    TaskType = dto.TaskType,
                    //TaskType = dto.TaskType,
                    TaskEndAddress = dto.InputValue,
                    TaskStatus = TaskInStatusEnum.InNew.ToString(),
                    CreateDate = DateTime.Now,
                    TaskStartDate = DateTime.Now,
                    TaskEndDate = DateTime.Now.AddDays(1),
                    TaskName = dto.TaskType.ToString(),
                    //TaskName = dto.TaskType.ToString(),
                    TaskNumber = dto.Number,
                    TaskExecutor = "CZ",
                    TaskOrderNo = dto.OrderNo,

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/CommonAGVJob.cs

@@ -2,7 +2,7 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_QuartzJob;

namespace WIDESEAWCS_Tasks.AGVJob
namespace WIDESEAWCS_Tasks
{
    [DisallowConcurrentExecution]
    public class CommonAGVJob : JobBase, IJob, IDisposable

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs

@@ -6,7 +6,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;

namespace WIDESEAWCS_Tasks.AGVJob
namespace WIDESEAWCS_Tasks
{
    public class SendTaskAGV
    {

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/UpdateTaskAGV.cs

@@ -4,7 +4,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;

namespace WIDESEAWCS_Tasks.AGVJob
namespace WIDESEAWCS_Tasks
{
    public class UpdateTaskAGV
    {