Merge remote-tracking branch 'origin/master'

cuilei

110 分钟以前 f95d05316d49bcdd31d022a11d0fc4fbafb040da

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	db/双林新火炬MES数据库设计.pdma.json

 db/Ë«ÁÖлð¾æMESÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -632,7 +632,7 @@
      "#DDE5FF"
    ],
    "DDLToggleCase": "L",
    "menuWidth": "331px"
    "menuWidth": "371px"
  },
  "entities": [
    {
@@ -61892,6 +61892,24 @@
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "2543E9E7-C40B-496B-AF48-D57B01A2B230"
        },
        {
          "defKey": "heat_treatment_flag",
          "defName": "热处理标识",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "7CA68F5B-F30F-4F91-9BBF-1B9A741F44AF"
        }
      ],
      "correlations": [],
@@ -62157,6 +62175,42 @@
          "id": "634556B3-6007-47EF-9E18-B2C20FC7ECDB"
        },
        {
          "defKey": "original_code",
          "defName": "来源编码",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
          "id": "2F160696-FB4C-485A-A60F-A91604E95A9D"
        },
        {
          "defKey": "original_name",
          "defName": "来源名称",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "837ABAD7-8529-40F0-99DB-88FC33B9339F"
        },
        {
          "defKey": "factory_id",
          "defName": "产线ID",
          "comment": "",
@@ -62295,8 +62349,26 @@
          "id": "7ACEF784-3F6B-470B-8BA7-1E38C2125667"
        },
        {
          "defKey": "inbound_category",
          "defName": "入库类型",
          "comment": "物料拉动、生产下线、热处理、小内圈、调拨",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "E8325FFD-1C27-4AEB-BC00-F0FD0E1D370A"
        },
        {
          "defKey": "receiver",
          "defName": "接收人",
          "defName": "入库人",
          "comment": "",
          "type": "",
          "len": "",
@@ -62314,7 +62386,7 @@
        },
        {
          "defKey": "receive_time",
          "defName": "接收时间",
          "defName": "入库时间",
          "comment": "",
          "type": "",
          "len": "",
@@ -63398,7 +63470,7 @@
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "0A646552-E539-44E6-AB49-69CF4BF16522"
        },
        {
@@ -63434,7 +63506,7 @@
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "6C143A29-E3B5-4308-A60F-D07E44C58B66"
        },
        {
@@ -65364,8 +65436,8 @@
          "id": "FBAA1CFF-AA71-46F8-B401-4EC0D39B022A"
        },
        {
          "defKey": "work_order_id",
          "defName": "工单ID",
          "defKey": "factory_id",
          "defName": "产线ID",
          "comment": "",
          "type": "",
          "len": "",
@@ -65379,61 +65451,7 @@
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "F9190578-1B7F-4A04-9F9F-EF15CE3E043C"
        },
        {
          "defKey": "equipment_id",
          "defName": "设备ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "291AF57C-AD4F-4691-BF15-1BDC4629A521"
        },
        {
          "defKey": "process_code",
          "defName": "工序编码",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
          "id": "3501D104-6767-40E3-8A99-0BDF17960C29"
        },
        {
          "defKey": "process_name",
          "defName": "工序名称",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "73290052-0C81-442D-BE27-B8CF1496F69E"
          "id": "2E08DF6D-E39A-4798-BC2A-B56CC7AE66B1"
        },
        {
          "defKey": "material_number",
@@ -69745,6 +69763,706 @@
      "correlations": [],
      "indexes": [],
      "type": "P"
    },
    {
      "id": "A3B555E5-225C-4432-9CB0-05A1C372AB83",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "mes_material_consumption_detail",
      "defName": "物料消耗明细",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "sysProps": {
        "nameTemplate": "{defKey}[{defName}]"
      },
      "notes": {},
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr1",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr2",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr3",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr4",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr5",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr6",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr7",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr8",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr9",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "id",
          "defName": "主键",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "E84CB7D9-BB16-4D0C-B592-8C4384FFAC3B"
        },
        {
          "defKey": "create_by",
          "defName": "创建人",
          "comment": "",
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "9D7DA32B-70D5-4F8E-929F-F178796661E6",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "create_time",
          "defName": "创建时间",
          "comment": "",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "6FCE5A8C-426B-4191-B841-C9C529F927DA",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "order_id",
          "defName": "订单ID",
          "comment": "半成品报工，无需绑定到生产订单",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "A9C8CDA4-F073-46FD-AAB4-D6401B7E5E8D",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "work_order_id",
          "defName": "工单ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "9B945A59-DF7A-4234-8C3C-8AA7BBFE9509",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "factory_id",
          "defName": "产线ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "70FEFA77-AEE0-45C9-BAFE-D5B6E07AE987",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "reporting_id",
          "defName": "报工ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "C8586134-EFC2-4930-B87D-EFADF765F584"
        },
        {
          "defKey": "loading_id",
          "defName": "上料ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "948875D7-C355-4E5F-8129-B3E8C2908594"
        },
        {
          "defKey": "quantity",
          "defName": "消耗数量",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E",
          "extProps": {},
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "id": "73E2D815-80C9-4A31-BB07-020959BC00DD"
        }
      ],
      "correlations": [],
      "indexes": [],
      "type": "P"
    },
    {
      "id": "9A75D273-970F-4B65-BC27-B9208EC1A4F2",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "base_printer_config",
      "defName": "打印机配置",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "sysProps": {
        "nameTemplate": "{defKey}[{defName}]"
      },
      "notes": {},
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr1",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr2",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr3",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr4",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr5",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr6",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr7",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr8",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr9",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "id",
          "defName": "主键",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "8012FE29-1A36-475C-85BE-0101BFF82556"
        },
        {
          "defKey": "create_by",
          "defName": "创建人",
          "comment": "",
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "B48C2340-15FC-4F3D-A483-BDAD359BC3A2",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "create_time",
          "defName": "创建时间",
          "comment": "",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "F6A6B53B-B7DC-42C1-8394-7A29F47AEB51",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "update_by",
          "defName": "更新人",
          "comment": "",
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "CE4DDFE2-4785-434B-AB6A-31C4CE82FF4A",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "update_time",
          "defName": "更新时间",
          "comment": "",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "59A6D7C4-1C85-4AB9-A113-137122C8D310",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "del_flag",
          "defName": "删除标记",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "1F9CD124-0E52-48AE-BE33-B2CDE2BD46CF"
        },
        {
          "defKey": "printer_name",
          "defName": "名称",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "EE70D71D-41B4-4B75-A190-0C7F0F692408"
        },
        {
          "defKey": "printer_ip",
          "defName": "IP地址",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "9733F3FF-86BC-43B5-81F9-6F12BF7AAF97"
        },
        {
          "defKey": "port_number",
          "defName": "端口",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "7BF0DB7E-0BC4-4604-B3B1-C0ABA8A1A090"
        },
        {
          "defKey": "printer_model",
          "defName": "型号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
          "id": "F3D2ED9C-6CE8-4DB5-A656-B2C1BB2A5249"
        },
        {
          "defKey": "printer_status",
          "defName": "状态",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "893D3D4B-C208-4147-909E-BBFF8FF7FB23"
        }
      ],
      "correlations": [],
      "indexes": [],
      "type": "P"
    }
  ],
  "views": [],
@@ -70586,7 +71304,8 @@
        "D16FD5E0-8B16-4C0E-AD67-6E5C2FED1A65",
        "5835D3E9-4B10-48DC-B116-584E447AA201",
        "23C6B8F0-0010-4453-B3C2-9305746C37AB",
        "D3263A0C-1D6A-453A-B933-86651B5566FE"
        "D3263A0C-1D6A-453A-B933-86651B5566FE",
        "A3B555E5-225C-4432-9CB0-05A1C372AB83"
      ],
      "refViews": [],
      "refDiagrams": [],
@@ -70659,7 +71378,8 @@
        "CDDBE073-093D-4D6A-AB29-0B3538417EBA",
        "0CE184D5-6F92-4384-AE88-96C81A581F9E",
        "B34D63A4-F6E7-407B-834F-ED01C13EDA80",
        "F5104CC1-0137-4EFD-8122-3593A9E005C4"
        "F5104CC1-0137-4EFD-8122-3593A9E005C4",
        "9A75D273-970F-4B65-BC27-B9208EC1A4F2"
      ],
      "refViews": [],
      "refDiagrams": [],

 pom.xml

@@ -59,7 +59,7 @@
        <log4j2.version>2.17.0</log4j2.version>
        <logback.version>1.2.9</logback.version>
        <!-- webservice -->
        <cxf.version>3.2.4</cxf.version>
        <cxf.version>3.5.2</cxf.version>
    </properties>

    <repositories>
@@ -227,21 +227,11 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web-services</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
            <version>${cxf.version}</version>
        </dependency>

        <!-- CXF webservice -->
        <dependency>
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
            <version>${cxf.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-rt-transports-http</artifactId>
            <version>${cxf.version}</version>
        </dependency>

@@ -268,6 +258,10 @@
                <exclusion>
                    <artifactId>commons-beanutils</artifactId>
                    <groupId>commons-beanutils</groupId>
                </exclusion>
                <exclusion>
                    <groupId>net.sf.saxon</groupId>
                    <artifactId>Saxon-HE</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
@@ -527,11 +521,11 @@
            <version>0.8</version>
        </dependency>
        <!--xml解析包：如果项目中已有，引起冲突，可注释-->
        <dependency>
            <groupId>xerces</groupId>
            <artifactId>xercesImpl</artifactId>
            <version>2.12.0</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>xerces</groupId>-->
<!--            <artifactId>xercesImpl</artifactId>-->
<!--            <version>2.12.0</version>-->
<!--        </dependency>-->

        <!--引入sap依赖-->
        <dependency>

 src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -1,7 +1,6 @@
package org.jeecg;

import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.spring.boot.autoconfigure.CxfAutoConfiguration;
import org.flowable.spring.boot.eventregistry.EventRegistryServicesAutoConfiguration;
import org.jeecg.common.util.oConvertUtils;
import org.springframework.boot.SpringApplication;
@@ -23,8 +22,7 @@
*/
@Slf4j
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, MongoAutoConfiguration.class,
        ManagementWebSecurityAutoConfiguration.class, EventRegistryServicesAutoConfiguration.class,
        CxfAutoConfiguration.class})
        ManagementWebSecurityAutoConfiguration.class, EventRegistryServicesAutoConfiguration.class})
public class JeecgSystemApplication extends SpringBootServletInitializer {

    @Override

 src/main/java/org/jeecg/modules/base/controller/FactoryController.java

@@ -226,7 +226,7 @@
     public Result<List<FactoryModel>> queryUserProductionLineList() {
         List<Factory> factoryList = factoryService.queryUserProductionLineList();
         List<FactoryModel> factoryModels = factoryList.stream()
                 .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
                 .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName(), factory.getProductionType()))
                 .collect(Collectors.toList());
         return Result.ok(factoryModels);
     }

 src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.base.controller;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -9,6 +10,7 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
@@ -192,8 +194,7 @@
     }


     //@AutoLog(value = "线边仓库信息-通过id查询")
     @ApiOperation(value="线边仓库信息-通过id查询", notes="线边仓库信息-通过id查询")
    @ApiOperation(value = "线边仓库信息-通过产线ID查询", notes = "线边仓库信息-通过产线ID查询")
     @GetMapping(value = "/queryByFactoryId")
     public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name="factoryId") String factoryId) {
         LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
@@ -203,4 +204,14 @@
         return Result.OK(lineSideWarehouse);
     }

    @ApiOperation(value = "线边仓库信息-通过产线分类查询", notes = "线边仓库信息-通过产线分类查询")
    @GetMapping(value = "/queryByProductionType")
    public Result<List<LineSideWarehouse>> queryByProductionType(@RequestParam(name = "productionType") String productionType) {
        List<LineSideWarehouse> list = lineSideWarehouseService.queryByProductionType(productionType);
        if (list == null) {
            return Result.OK(Collections.emptyList());
        }
        return Result.OK(list);
    }

}

 src/main/java/org/jeecg/modules/base/controller/PrinterConfigController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,186 @@
package org.jeecg.modules.base.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.PrinterConfig;
import org.jeecg.modules.base.model.FactoryModel;
import org.jeecg.modules.base.model.PrinterModel;
import org.jeecg.modules.base.service.IPrinterConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
* @Description: æ‰“印机配置信息
* @Author: jeecg-boot
* @Date:   2025-06-24
* @Version: V1.0
*/
@Api(tags="打印机配置信息")
@RestController
@RequestMapping("/base/printerConfig")
@Slf4j
public class PrinterConfigController extends JeecgController<PrinterConfig, IPrinterConfigService> {
   @Autowired
   private IPrinterConfigService printerConfigService;

   /**
    * åˆ†é¡µåˆ—表查询
    *
    * @param printerConfig
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   @ApiOperation(value="打印机信息-分页列表查询", notes="打印机信息-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<PrinterConfig>> queryPageList(PrinterConfig printerConfig,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<PrinterConfig> queryWrapper = QueryGenerator.initQueryWrapper(printerConfig, req.getParameterMap());
       Page<PrinterConfig> page = new Page<PrinterConfig>(pageNo, pageSize);
       IPage<PrinterConfig> pageList = printerConfigService.page(page, queryWrapper);
       return Result.OK(pageList);
   }



    @ApiOperation(value = "获取所有打印机IP列表", notes = "获取所有打印机IP列表")
    @GetMapping(value = "/queryUserPrinterConfigList")
    public Result<List<PrinterModel>> queryUserPrinterConfigList() {
        List<PrinterConfig> printerConfigList = printerConfigService.queryUserPrinterConfigList();
        List<PrinterModel> factoryModels = printerConfigList.stream()
                .map(factory -> new PrinterModel(factory.getPrinterIp(), factory.getPrinterIp()))
                .collect(Collectors.toList());
        return Result.ok(factoryModels);
    }
   /**
    *   æ·»åŠ 
    *
    * @param printerConfig
    * @return
    */
   @AutoLog(value = "打印机信息-添加")
   @ApiOperation(value="打印机信息-添加", notes="打印机信息-添加")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody PrinterConfig printerConfig) {
       printerConfig.setPrinterStatus(CommonConstant.STATUS_1);
       printerConfigService.save(printerConfig);
       return Result.OK("添加成功！");
   }

   /**
    *  ç¼–辑
    *
    * @param printerConfig
    * @return
    */
   @AutoLog(value = "线边仓库信息-编辑")
   @ApiOperation(value="线边仓库信息-编辑", notes="线边仓库信息-编辑")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody PrinterConfig printerConfig) {
       printerConfigService.updateById(printerConfig);
       return Result.OK("编辑成功!");
   }

   /**
    *   é€šè¿‡id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "线边仓库信息-通过id删除")
   @ApiOperation(value="线边仓库信息-通过id删除", notes="线边仓库信息-通过id删除")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       printerConfigService.removeById(id);
       return Result.OK("删除成功!");
   }

   /**
    *  æ‰¹é‡åˆ é™¤
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "打印机信息-批量删除")
   @ApiOperation(value="打印机信息-批量删除", notes="打印机信息-批量删除")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.printerConfigService.removeByIds(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }

   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "线边仓库信息-通过id查询")
   @ApiOperation(value="打印机信息-通过id查询", notes="打印机信息-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<PrinterConfig> queryById(@RequestParam(name="id",required=true) String id) {
       PrinterConfig lineSideWarehouse = printerConfigService.getById(id);
       if(lineSideWarehouse==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(lineSideWarehouse);
   }

   /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param printerConfig
   */
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, PrinterConfig printerConfig) {
       return super.exportXls(request, printerConfig, PrinterConfig.class, "打印机信息");
   }

   /**
     * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, PrinterConfig.class);
   }

    @AutoLog(value = "打印机-启用&禁用")
    @ApiOperation(value = "打印机-启用&禁用", notes = "打印机-启用&禁用")
    @PutMapping(value = "/active")
    public Result<?> active(@RequestParam(name = "id", required = true) String id) {
        PrinterConfig printerConfig = printerConfigService.getById(id);
        if (CommonConstant.STATUS_1.equals(printerConfig.getPrinterStatus())) {
            printerConfig.setPrinterStatus(CommonConstant.STATUS_0);
        } else {
            printerConfig.setPrinterStatus(CommonConstant.STATUS_1);
        }
        printerConfigService.updateById(printerConfig);
        return Result.ok("操作成功！");
    }

}

 src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java

@@ -1,23 +1,22 @@
package org.jeecg.modules.base.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: çº¿è¾¹ä»“库信息

 src/main/java/org/jeecg/modules/base/entity/PrinterConfig.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
package org.jeecg.modules.base.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: æ‰“印机配置信息
 * @Author: jeecg-boot
 * @Date: 2025-06-24
 * @Version: V1.0
 */
@Data
@TableName("base_printer_config")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "base_printer_config对象", description = "打印机配置信息")
public class PrinterConfig implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®
     */
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * åˆ›å»ºäºº
     */
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * æ›´æ–°äºº
     */
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**
     * æ›´æ–°æ—¶é—´
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**
     * åˆ é™¤æ ‡è®°
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**
     * æ‰“印机IP
     */
    @Excel(name = "打印机IP", width = 15)
    @ApiModelProperty(value = "打印机IP")
    private String printerIp;

    /**
     * æ‰“印机IP
     */
    @Excel(name = "打印机名称", width = 15)
    @ApiModelProperty(value = "打印机名称")
    private String printerName;
    /**
     * æ‰“印机端口
     */
    @Excel(name = "打印机端口", width = 15)
    @ApiModelProperty(value = "打印机端口")
    private String portNumber;
    /**
     * æ‰“印机型号
     */
    @Excel(name = "打印机型号", width = 15)
    @ApiModelProperty(value = "打印机型号")
    private String printerModel;

    /**打印机状态*/
    @Excel(name = "打印机状态", width = 15)
    @ApiModelProperty(value = "打印机状态")
    private String printerStatus;
}

 src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java

@@ -14,4 +14,10 @@
 */
public interface LineSideWarehouseMapper extends BaseMapper<LineSideWarehouse> {

    /**
     * é€šè¿‡äº§çº¿ç±»åž‹æŸ¥è¯¢çº¿è¾¹åº“
     * @param types
     * @return
     */
    List<LineSideWarehouse> queryByProductionType(@Param("types") String[] types);
}

 src/main/java/org/jeecg/modules/base/mapper/PrinterConfigMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.base.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.base.entity.PrinterConfig;

/**
 * @Description: æ‰“印机信息配置
 * @Author: jeecg-boot
 * @Date:   2025-06-24
 * @Version: V1.0
 */
public interface PrinterConfigMapper extends BaseMapper<PrinterConfig> {

}

 src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml

@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.LineSideWarehouseMapper">

    <select id="queryByProductionType" resultType="org.jeecg.modules.base.entity.LineSideWarehouse">
        select t1.* from base_line_side_warehouse t1
        left join base_factory t2 on t1.factory_id = t2.id
        where t1.del_flag='0' and t1.warehouse_status='1' and
        <foreach collection="types" item="item" open=" t2.production_type IN (" close=")" separator=",">#{item}</foreach>
        order by t1.warehouse_code
    </select>
</mapper>

 src/main/java/org/jeecg/modules/base/mapper/xml/PrinterConfigMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.PrinterConfigMapper">

</mapper>

 src/main/java/org/jeecg/modules/base/model/FactoryModel.java

@@ -7,12 +7,13 @@
    // getter和setter方法
    private String value;  // äº§çº¿ID
    private String text;   // äº§çº¿åç§°

    private String type;   // äº§çº¿ç±»åž‹
    public FactoryModel() {
    }

    public FactoryModel(String value, String text) {
    public FactoryModel(String value, String text, String type) {
        this.value = value;
        this.text = text;
        this.type = type;
    }
}

 src/main/java/org/jeecg/modules/base/model/PrinterModel.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.base.model;

import lombok.Data;

@Data
public class PrinterModel {
    // getter和setter方法
    private String value;
    private String text;

    public PrinterModel() {
    }

    public PrinterModel(String value, String text) {
        this.value = value;
        this.text = text;

    }
}

 src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java

@@ -3,6 +3,8 @@
import org.jeecg.modules.base.entity.LineSideWarehouse;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * @Description: çº¿è¾¹ä»“库信息
 * @Author: jeecg-boot
@@ -17,4 +19,18 @@
     * @return
     */
    LineSideWarehouse queryByFactoryId(String factoryId);

    /**
     * æ ¹æ®äº§çº¿ç±»åž‹æŸ¥è¯¢çº¿è¾¹åº“
     * @param productionType
     * @return
     */
    List<LineSideWarehouse> queryByProductionType(String productionType);

    /**
     * çº¿è¾¹åº“编码
     * @param warehouseCode
     * @return
     */
    LineSideWarehouse queryByWarehouseCode(String warehouseCode);
}

 src/main/java/org/jeecg/modules/base/service/IPrinterConfigService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package org.jeecg.modules.base.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.PrinterConfig;

import java.util.List;

/**
 * @Description: æ‰“印机配置
 * @Author: jeecg-boot
 * @Date:   2025-06-24
 * @Version: V1.0
 */
public interface IPrinterConfigService extends IService<PrinterConfig> {
    /**
     * æŸ¥è¯¢IP列表
     * @return
     */
    List<PrinterConfig> queryUserPrinterConfigList();
}

 src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java

@@ -2,10 +2,15 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.mapper.LineSideWarehouseMapper;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

/**
 * @Description: çº¿è¾¹ä»“库信息
@@ -26,4 +31,22 @@
        }
        return entity;
    }

    @Override
    public List<LineSideWarehouse> queryByProductionType(String productionType) {
        if(StringUtils.isBlank(productionType)) {
            return Collections.emptyList();
        }
        String[] types = productionType.split(",");
        return this.getBaseMapper().queryByProductionType(types);
    }

    @Override
    public LineSideWarehouse queryByWarehouseCode(String warehouseCode) {
        LambdaQueryWrapper<LineSideWarehouse> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LineSideWarehouse::getWarehouseCode, warehouseCode);
        wrapper.eq(LineSideWarehouse::getDelFlag, CommonConstant.DEL_FLAG_0);
        wrapper.eq(LineSideWarehouse::getWarehouseStatus, CommonConstant.STATUS_1);
        return this.getBaseMapper().selectOne(wrapper);
    }
}

 src/main/java/org/jeecg/modules/base/service/impl/PrinterConfigServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package org.jeecg.modules.base.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.PrinterConfig;
import org.jeecg.modules.base.mapper.PrinterConfigMapper;
import org.jeecg.modules.base.service.IPrinterConfigService;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

/**
 * @Description: æ‰“印机配置信息
 * @Author: jeecg-boot
 * @Date:   2025-06-24
 * @Version: V1.0
 */
@Service
public class PrinterConfigServiceImpl extends ServiceImpl<PrinterConfigMapper, PrinterConfig> implements IPrinterConfigService {

    @Override
    public List<PrinterConfig> queryUserPrinterConfigList() {
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return Collections.emptyList();
        }
        LambdaQueryWrapper<PrinterConfig> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(PrinterConfig::getDelFlag, CommonConstant.DEL_FLAG_0);
        queryWrapper.eq(PrinterConfig::getPrinterStatus, "1");
        return super.list(queryWrapper);
    }
}

 src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java

@@ -279,163 +279,75 @@


    /*
     * ç”Ÿæˆå”¯ä¸€æ¡ç çš„方法
     * ç”Ÿæˆå”¯ä¸€æ¡ç çš„方法（目前还没有编码规则，确定后在这里改）
     */
    private String generateUniqueBarcode(String cuttingId, int index) {
        // æ¡ç ç”Ÿæˆè§„则示例：刀具ID + åºå·(4位) + éšæœºæ•°
        return cuttingId + String.format("%04d", index + 1) + (int) (Math.random() * 10000);
    }
//    @GetMapping("/submit")
//    public Result<?> submit(@RequestParam("orderId") String orderId) {
//        //         cuttingInboundService.submit(orderId);
//        //         return Result.ok("提交成功");

    @GetMapping("/submit")
    @Timed(value = "cutting.inbound.submit", description = "刀具入库提交耗时")
    public Result<?> submit(@RequestParam("orderId") String orderId) {
//        long startTime = System.currentTimeMillis();
//        try {
//            // 1. æ›´æ–°å…¥åº“单状态
//            CuttingInbound cuttingInbound = cuttingInboundService.getById(orderId);
//            if (cuttingInbound == null) {
//                return Result.error("未找到对应的入库单");
//            }
//
//            // æ£€æŸ¥å…¥åº“单状态，只允许状态为"1"的入库单提交
//            if (!"1".equals(cuttingInbound.getOrderStatus())) {
//                return Result.error("只有状态为未提交的入库单才能执行提交操作");
//            }
//
//            // 2. æ›´æ–°çŠ¶æ€ä¸ºå·²æäº¤
//            cuttingInbound.setOrderStatus("2");
//            boolean updateResult = cuttingInboundService.updateById(cuttingInbound);
//            if (!updateResult) {
//                return Result.error("更新入库单状态失败");
//            }
//            cuttingInboundService.updateById(cuttingInbound);
//
//            // 3. èŽ·å–入库明细
//            // 2. èŽ·å–入库明细
//            List<CuttingInboundDetail> detailList = cuttingInboundDetailService.lambdaQuery()
//                    .eq(CuttingInboundDetail::getOrderId, orderId)
//                    .list();
//
//            // ç”¨äºŽç»Ÿè®¡æ€»æ•°é‡
//            int totalSubmitted = 0;
//
//            // æ‰¹é‡ä¿å­˜çš„列表
//            // 3. æ”¶é›†æ‰€æœ‰éœ€è¦ä¿å­˜çš„数据
//            List<CuttingInventory> inventoryList = new ArrayList<>();
//            List<CuttingInboundInventory> inboundInventoryList = new ArrayList<>();
//
//            // 4. æ ¹æ®æ˜Žç»†æ•°é‡ç”Ÿæˆåº“存记录和条码
//            for (CuttingInboundDetail detail : detailList) {
//                // æ ¹æ®æ˜Žç»†ä¸­çš„数量生成对应数量的库存记录receive_number
//                int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber() : 0;
//                for (int i = 0; i < quantity; i++) {
//                    totalSubmitted++;
//                    // ä¸ºæ¯ä¸ªåˆ€å…·ç”Ÿæˆç‹¬ç«‹çš„库存记录
//                    CuttingInventory cuttingInventory = new CuttingInventory();
//                    String inventoryId = UUID.randomUUID().toString().replace("-", "");
//                    cuttingInventory.setId(inventoryId);
//                    cuttingInventory.setCuttingId(detail.getCuttingId());
//                    // ä¸ºæ¯ä¸ªåˆ€å…·ç”Ÿæˆå”¯ä¸€æ¡ç 
//                    cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
//                    // è®¾ç½®åº“存状态为在库
//                    cuttingInventory.setInventoryStatus("正常");
//                    // è®¾ç½®å½“前寿命为100
//                    cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
//                    // æ·»åŠ åˆ°æ‰¹é‡ä¿å­˜åˆ—表
//                    inventoryList.add(cuttingInventory);
//                int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber().intValue() : 0;
//
//                    // å»ºç«‹å…¥åº“单与库存的关联关系
//                for (int i = 0; i < quantity; i++) {
//                    // ç”Ÿæˆåº“存记录
//                    CuttingInventory cuttingInventory = new CuttingInventory();
//                    cuttingInventory.setCuttingId(detail.getCuttingId());
//                    cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
//                    cuttingInventory.setInventoryStatus("正常");
//                    cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
//                    inventoryList.add(cuttingInventory);
//                }
//            }
//
//            // 4. æ‰¹é‡ä¿å­˜åº“存记录（一次性操作）
//            if (!inventoryList.isEmpty()) {
//                cuttingInventoryService.saveBatch(inventoryList);
//
//                // 5. ä¸ºæ¯ä¸ªä¿å­˜çš„库存记录创建关联关系
//                for (CuttingInventory inventory : inventoryList) {
//                    CuttingInboundInventory cuttingInboundInventory = new CuttingInboundInventory();
//                    cuttingInboundInventory.setOrderId(orderId);
//                    cuttingInboundInventory.setInventoryId(inventoryId);
//                    // æ·»åŠ åˆ°æ‰¹é‡ä¿å­˜åˆ—表
//                    cuttingInboundInventory.setInventoryId(inventory.getId());
//                    inboundInventoryList.add(cuttingInboundInventory);
//                }
//
//                // 6. æ‰¹é‡ä¿å­˜å…³è”关系（一次性操作）
//                cuttingInboundInventoryService.saveBatch(inboundInventoryList);
//            }
//
//            // æ‰¹é‡ä¿å­˜åº“存记录
//            if (!inventoryList.isEmpty()) {
//                boolean saveResult = cuttingInventoryService.saveBatch(inventoryList);
//                if (!saveResult) {
//                    throw new RuntimeException("保存库存记录失败");
//                }
//            }
//            long endTime = System.currentTimeMillis();
//            log.info("刀具入库提交完成，耗时: {} s", (endTime - startTime)/1000);
//            return Result.ok("提交成功");
//
//            // æ‰¹é‡ä¿å­˜å…³è”关系
//            if (!inboundInventoryList.isEmpty()) {
//                boolean relationSaveResult = cuttingInboundInventoryService.saveBatch(inboundInventoryList);
//                if (!relationSaveResult) {
//                    throw new RuntimeException("保存关联关系失败");
//                }
//            }
//
//            Map<String, Object> result = new HashMap<>();
//            result.put("message", "提交成功");
//            result.put("totalSubmitted", totalSubmitted);
//            return Result.ok(result);
//        } catch (Exception e) {
//            log.error("提交入库单失败，orderId: " + orderId, e);
//            throw new RuntimeException("提交失败: " + e.getMessage(), e);
//            long endTime = System.currentTimeMillis();
//            log.error("提交入库单失败，orderId: " + orderId + "，耗时: " + (endTime - startTime) + " ms", e);
//            return Result.error("提交失败: " + e.getMessage());
//        }
//    }

    @GetMapping("/submit")
    @Timed(value = "cutting.inbound.submit", description = "刀具入库提交耗时")
    public Result<?> submit(@RequestParam("orderId") String orderId) {
        long startTime = System.currentTimeMillis();
        try {
            // 1. æ›´æ–°å…¥åº“单状态
            CuttingInbound cuttingInbound = cuttingInboundService.getById(orderId);
            if (cuttingInbound == null) {
                return Result.error("未找到对应的入库单");
            }
            cuttingInbound.setOrderStatus("2");
            cuttingInboundService.updateById(cuttingInbound);

            // 2. èŽ·å–入库明细
            List<CuttingInboundDetail> detailList = cuttingInboundDetailService.lambdaQuery()
                    .eq(CuttingInboundDetail::getOrderId, orderId)
                    .list();

            // 3. æ”¶é›†æ‰€æœ‰éœ€è¦ä¿å­˜çš„数据
            List<CuttingInventory> inventoryList = new ArrayList<>();
            List<CuttingInboundInventory> inboundInventoryList = new ArrayList<>();

            for (CuttingInboundDetail detail : detailList) {
                int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber().intValue() : 0;

                for (int i = 0; i < quantity; i++) {
                    // ç”Ÿæˆåº“存记录
                    CuttingInventory cuttingInventory = new CuttingInventory();
                    cuttingInventory.setCuttingId(detail.getCuttingId());
                    cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
                    cuttingInventory.setInventoryStatus("正常");
                    cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
                    inventoryList.add(cuttingInventory);
                }
            }

            // 4. æ‰¹é‡ä¿å­˜åº“存记录（一次性操作）
            if (!inventoryList.isEmpty()) {
                cuttingInventoryService.saveBatch(inventoryList);

                // 5. ä¸ºæ¯ä¸ªä¿å­˜çš„库存记录创建关联关系
                for (CuttingInventory inventory : inventoryList) {
                    CuttingInboundInventory cuttingInboundInventory = new CuttingInboundInventory();
                    cuttingInboundInventory.setOrderId(orderId);
                    cuttingInboundInventory.setInventoryId(inventory.getId());
                    inboundInventoryList.add(cuttingInboundInventory);
                }

                // 6. æ‰¹é‡ä¿å­˜å…³è”关系（一次性操作）
                cuttingInboundInventoryService.saveBatch(inboundInventoryList);
            }

            long endTime = System.currentTimeMillis();
            log.info("刀具入库提交完成，耗时: {} s", (endTime - startTime)/1000);
            return Result.ok("提交成功");

        } catch (Exception e) {
            long endTime = System.currentTimeMillis();
            log.error("提交入库单失败，orderId: " + orderId + "，耗时: " + (endTime - startTime) + " ms", e);
            return Result.error("提交失败: " + e.getMessage());
        }
        return cuttingInboundService.submit(orderId);
    }
}


 src/main/java/org/jeecg/modules/cms/controller/CuttingInventoryController.java

@@ -6,6 +6,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.cms.entity.CuttingInventory;

 src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java

 src/main/java/org/jeecg/modules/cms/controller/CuttingToolController.java

@@ -198,7 +198,7 @@
        return super.importExcel(request, response, CuttingTool.class);
    }


    //选择刀具的接口
     @GetMapping(value = "/getCuttingToolList")
     public Result<?> getCuttingToolList(@RequestParam("pageNo") Integer pageNo,
                                       @RequestParam("pageSize") Integer pageSize,

 src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java

@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -57,6 +55,9 @@
    @ApiModelProperty(value = "刀具ID")
    @Dict(dictTable = "cms_cutting_tool",dicCode="id",dicText = "cutting_code")
    private String cuttingId;

    @TableField(exist = false) // è¡¨ç¤ºè¿™ä¸æ˜¯æ•°æ®åº“字段
    private String cuttingCode;
    /**刀具条码*/
    @Excel(name = "刀具条码", width = 15)
    @ApiModelProperty(value = "刀具条码")
@@ -69,4 +70,11 @@
    @Excel(name = "当前寿命(百分比)", width = 15)
    @ApiModelProperty(value = "当前寿命(百分比)")
    private BigDecimal currentLife;

    // åœ¨CuttingInventory实体类中添加
    @TableField(exist = false) // è¡¨ç¤ºè¿™ä¸æ˜¯æ•°æ®åº“字段
    private String cuttingIdSearch;

    @TableField(exist = false) // è¡¨ç¤ºè¿™ä¸æ˜¯æ•°æ®åº“字段
    private String cuttingBarcodeSearch;
}

 src/main/java/org/jeecg/modules/cms/mapper/CuttingReceiveDetailMapper.java

@@ -15,5 +15,5 @@
 */
public interface CuttingReceiveDetailMapper extends BaseMapper<CuttingReceiveDetail> {

    public List<Map<String, Object>> detailList(@Param("orderId") String orderId);
    List<Map<String, Object>> detailList(@Param("orderId") String orderId);
}

 src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java

@@ -15,4 +15,6 @@
 */
public interface ICuttingInboundService extends IService<CuttingInbound> {
    Result<?> importExcelData(List<CuttingInboundExportVo> list);

    Result<?> submit(String orderId);
}

 src/main/java/org/jeecg/modules/cms/service/ICuttingReceiveDetailService.java

@@ -7,6 +7,7 @@
import java.util.Map;

/**
 *
 * @Description: é¢†ç”¨å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-07-28
@@ -14,5 +15,5 @@
 */
public interface ICuttingReceiveDetailService extends IService<CuttingReceiveDetail> {

    public List<Map<String, Object>> detailList(String orderId);
    List<Map<String, Object>> detailList(String orderId);
}

 src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java

@@ -1,17 +1,25 @@
package org.jeecg.modules.cms.service.impl;

import io.micrometer.core.annotation.Timed;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.cms.entity.CuttingInbound;
import org.jeecg.modules.cms.entity.CuttingInboundDetail;
import org.jeecg.modules.cms.entity.CuttingInboundInventory;
import org.jeecg.modules.cms.entity.CuttingInventory;
import org.jeecg.modules.cms.mapper.CuttingInboundMapper;
import org.jeecg.modules.cms.service.ICuttingInboundInventoryService;
import org.jeecg.modules.cms.service.ICuttingInboundService;
import org.jeecg.modules.cms.service.ICuttingInboundDetailService;
import org.jeecg.modules.cms.service.ICuttingInventoryService;
import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +30,18 @@
 * @Date:   2025-07-28
 * @Version: V1.0
 */

@Slf4j
@Service
public class CuttingInboundServiceImpl extends ServiceImpl<CuttingInboundMapper, CuttingInbound> implements ICuttingInboundService {
    @Autowired
    private ICuttingInboundDetailService cuttingInboundDetailService; // æ³¨å…¥ä»Žè¡¨æœåŠ¡

    @Autowired
    private ICuttingInventoryService cuttingInventoryService;

    @Autowired
    private ICuttingInboundInventoryService cuttingInboundInventoryService;
    /**
     * é€šè¿‡Excel导入刀具入库单数据
     *
@@ -35,39 +51,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result<?> importExcelData(List<CuttingInboundExportVo> list) {
//        try {
//            for (CuttingInboundExportVo exportVo : list) {
//                // ä¿å­˜ä¸»è¡¨æ•°æ®
//                CuttingInbound cuttingInbound = new CuttingInbound();
//                cuttingInbound.setReceiver(exportVo.getReceiver());
//                cuttingInbound.setReceiveTime(exportVo.getReceiveTime());
//                cuttingInbound.setReceiveComment(exportVo.getReceiveComment());
//                cuttingInbound.setConfirmer(exportVo.getConfirmer());
//                cuttingInbound.setConfirmTime(exportVo.getConfirmTime());
//                cuttingInbound.setConfirmComment(exportVo.getConfirmComment());
//                cuttingInbound.setOrderStatus(exportVo.getOrderStatus());
//
//                // ä¿å­˜ä¸»è¡¨æ•°æ®ä»¥èŽ·å–ID
//                this.save(cuttingInbound);
//
//                // èŽ·å–主表ID
//                String orderId = cuttingInbound.getId();
//
//                // å¤„理从表数据
//                List<CuttingInboundDetail> detailList = exportVo.getDetailList();
//                if (detailList != null && !detailList.isEmpty()) {
//                    for (CuttingInboundDetail detail : detailList) {
//                        detail.setOrderId(orderId); // è®¾ç½®å¤–键关联
//                        cuttingInboundDetailService.save(detail);
//                    }
//                }
//            }
//            return Result.ok("导入成功");
//        } catch (Exception e) {
//            log.error("导入失败", e);
//            return Result.error("导入失败: " + e.getMessage());
//        }
//    }

        for (CuttingInboundExportVo exportVo : list) {
            // ä¿å­˜ä¸»è¡¨æ•°æ®
            CuttingInbound cuttingInbound = new CuttingInbound();
@@ -96,4 +80,88 @@
        }
        return Result.ok("导入成功");
    }


    /*
     * ç”Ÿæˆå”¯ä¸€æ¡ç çš„方法（确定编码生成规则后在此处重写）
     */
    private String generateUniqueBarcode(String cuttingId, int index) {
        // æ¡ç ç”Ÿæˆè§„则示例：刀具ID + åºå·(4位) + éšæœºæ•°
        return cuttingId + String.format("%04d", index + 1) + (int) (Math.random() * 10000);
    }
    @Override
    @Timed(value = "cutting.inbound.submit", description = "刀具入库提交耗时")
    public synchronized Result<?> submit(String orderId) {
        long startTime = System.currentTimeMillis();
        try {
            // 1. æ›´æ–°å…¥åº“单状态
            CuttingInbound cuttingInbound = this.getById(orderId);
            if (cuttingInbound == null) {
                return Result.error("未找到对应的入库单");
            }

            // æ£€æŸ¥å…¥åº“单状态，只允许状态为"1"的入库单提交
            if (!"1".equals(cuttingInbound.getOrderStatus())) {
                return Result.error("只有状态为未提交的入库单才能执行提交操作");
            }

            cuttingInbound.setOrderStatus("2");
            boolean updateResult = this.updateById(cuttingInbound);
            if (!updateResult) {
                return Result.error("更新入库单状态失败，可能已被其他用户处理");
            }

            // 2. èŽ·å–入库明细
            List<CuttingInboundDetail> detailList = cuttingInboundDetailService.lambdaQuery()
                    .eq(CuttingInboundDetail::getOrderId, orderId)
                    .list();

            // 3. æ”¶é›†æ‰€æœ‰éœ€è¦ä¿å­˜çš„数据
            List<CuttingInventory> inventoryList = new ArrayList<>();
            List<CuttingInboundInventory> inboundInventoryList = new ArrayList<>();

            for (CuttingInboundDetail detail : detailList) {
                int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber().intValue() : 0;

                for (int i = 0; i < quantity; i++) {
                    // ç”Ÿæˆåº“存记录
                    CuttingInventory cuttingInventory = new CuttingInventory();
                    cuttingInventory.setCuttingId(detail.getCuttingId());
                    cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
                    cuttingInventory.setInventoryStatus("正常");
                    cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
                    inventoryList.add(cuttingInventory);
                }
            }

            // 4. æ‰¹é‡ä¿å­˜åº“存记录（一次性操作）
            if (!inventoryList.isEmpty()) {
                cuttingInventoryService.saveBatch(inventoryList);

                // 5. ä¸ºæ¯ä¸ªä¿å­˜çš„库存记录创建关联关系
                for (CuttingInventory inventory : inventoryList) {
                    CuttingInboundInventory cuttingInboundInventory = new CuttingInboundInventory();
                    cuttingInboundInventory.setOrderId(orderId);
                    cuttingInboundInventory.setInventoryId(inventory.getId());
                    inboundInventoryList.add(cuttingInboundInventory);
                }

                // 6. æ‰¹é‡ä¿å­˜å…³è”关系（一次性操作）
                cuttingInboundInventoryService.saveBatch(inboundInventoryList);
            }

            long endTime = System.currentTimeMillis();
            log.info("刀具入库提交完成，耗时: {} ms", (endTime - startTime));
            return Result.ok("提交成功");

        } catch (Exception e) {
            long endTime = System.currentTimeMillis();
            log.error("提交入库单失败，orderId: " + orderId + "，耗时: " + (endTime - startTime) + " ms", e);
            return Result.error("提交失败: " + e.getMessage());
        }
    }




}

 src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java

@@ -11,13 +11,13 @@
    @Excel(name = "NO", width = 15)
    private String itemCode;

    @Excel(name = "部位名称", width = 15)
    @Excel(name = "点检内容", width = 15)
    private String itemName;

    @Excel(name = "点检内容", width = 15)
    @Excel(name = "点检方法", width = 15)
    private String subItemName;

    @Excel(name = "点检方法", width = 15)
    @Excel(name = "部位名称", width = 15)
    private String itemPart;

    @Excel(name = "基准", width = 15)

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java

@@ -9,38 +9,24 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.enums.ProductionTypeEnum;
import org.jeecg.modules.base.service.IFactoryService;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.enums.MaterialCategoryEnum;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.lsw.vo.LswMaterialPage;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;

/**
 * @Description: çº¿è¾¹åº“物料信息
@@ -55,10 +41,6 @@
public class LswMaterialController {
    @Autowired
    private ILswMaterialService lswMaterialService;
    @Autowired
    private ILswMaterialInventoryService lswMaterialInventoryService;
    @Autowired
    private ILineSideWarehouseService lineSideWarehouseService;
    @Autowired
    private IFactoryService factoryService;

@@ -147,28 +129,6 @@

    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "物料库存信息通过主表ID查询")
    @ApiOperation(value = "物料库存信息主表ID查询", notes = "物料库存信息-通主表ID查询")
    @GetMapping(value = "/queryLswMaterialInventoryByMainId")
    public Result<List<LswMaterialInventory>> queryLswMaterialInventoryListByMainId(@RequestParam(name = "id", required = true) String id) {
        List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(id);
        for (LswMaterialInventory lswMaterialInventory : lswMaterialInventoryList) {
            if (StringUtils.isNotEmpty(lswMaterialInventory.getWarehouseId())) {
                String warehouseId = lswMaterialInventory.getWarehouseId();
                LineSideWarehouse warehouse = lineSideWarehouseService.getById(warehouseId);
                lswMaterialInventory.setWarehouseName(warehouse.getWarehouseName());
            }
        }
        return Result.OK(lswMaterialInventoryList);
    }

    @AutoLog(value = "线边库物料信息-通过产线类型查询线边库物料")
    @ApiOperation(value = "线边库物料信息-通过产线类型查询线边库物料", notes = "线边库物料信息-通过产线类型查询线边库物料")
    @GetMapping(value = "/queryLswMaterialByProductionType")
    public Result<List<LswMaterial>> queryLswMaterialByProductionType(@RequestParam("factoryId") String factoryId) {
@@ -207,54 +167,19 @@
        return Result.OK(lswMaterialList);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param lswMaterial
     */
    //@RequiresPermissions("org.jeecg.modules:lsw_material:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, LswMaterial lswMaterial) {
        // Step.1 ç»„装查询条件查询数据
        QueryWrapper<LswMaterial> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterial, request.getParameterMap());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

        //配置选中数据查询条件
        String selections = request.getParameter("selections");
        if (oConvertUtils.isNotEmpty(selections)) {
            List<String> selectionList = Arrays.asList(selections.split(","));
            queryWrapper.in("id", selectionList);
    @ApiOperation(value = "线边库物料信息-根据物料类型查询", notes = "线边库物料信息-根据物料类型查询")
    @GetMapping(value = "/queryByMaterialCategory")
    public Result<List<LswMaterial>> queryByMaterialCategory(@RequestParam("materialCategory") String materialCategory) {
        if (StringUtils.isBlank(materialCategory)) {
            return Result.ok(Collections.emptyList());
        }
        //Step.2 èŽ·å–导出数据
        String[] split = materialCategory.split(",");
        LambdaQueryWrapper<LswMaterial> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(LswMaterial::getMaterialCategory, Arrays.asList(split));
        queryWrapper.eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0);
        queryWrapper.eq(LswMaterial::getMaterialStatus, CommonConstant.STATUS_1);
        queryWrapper.orderByAsc(LswMaterial::getMaterialNumber);
        List<LswMaterial> lswMaterialList = lswMaterialService.list(queryWrapper);

        // Step.3 ç»„装pageList
        List<LswMaterialPage> pageList = new ArrayList<LswMaterialPage>();
        for (LswMaterial main : lswMaterialList) {
            LswMaterialPage vo = new LswMaterialPage();
            BeanUtils.copyProperties(main, vo);
            List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(main.getId());
            vo.setLswMaterialInventoryList(lswMaterialInventoryList);
            pageList.add(vo);
        return Result.ok(lswMaterialList);
        }

        // Step.4 AutoPoi å¯¼å‡ºExcel
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        mv.addObject(NormalExcelConstants.FILE_NAME, "线边库物料信息列表");
        mv.addObject(NormalExcelConstants.CLASS, LswMaterialPage.class);
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("线边库物料信息数据", "导出人:" + sysUser.getRealname(), "线边库物料信息"));
        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
        return mv;
    }

    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(LswMaterial lswMaterial,
                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                     HttpServletRequest req) {
        IPage<Map<String, Object>> pageList = lswMaterialService.getLswMaterialListData(pageNo, pageSize, req);
        return Result.OK(pageList);
    }

}

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java

@@ -6,11 +6,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@
*/
@Api(tags="物料入库单")
@RestController
@RequestMapping("/lswmaterialinbound/lswMaterialInbound")
@RequestMapping("/lsw/materialInbound")
@Slf4j
public class LswMaterialInboundController extends JeecgController<LswMaterialInbound, ILswMaterialInboundService> {
   @Autowired
@@ -66,11 +67,21 @@
    */
   @AutoLog(value = "物料入库单-添加")
   @ApiOperation(value="物料入库单-添加", notes="物料入库单-添加")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_inbound:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody LswMaterialInbound lswMaterialInbound) {
       lswMaterialInboundService.save(lswMaterialInbound);
       return Result.OK("添加成功！");
       if(lswMaterialInbound == null){
           return Result.error("入库信息不能为空！");
       }
       LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
       if(sysUser == null){
           return Result.error("用户信息获取失败！");
       }
       lswMaterialInbound.setReceiver(sysUser.getUsername());
       boolean b = lswMaterialInboundService.inboundMaterial(lswMaterialInbound);
       if(!b) {
           return Result.error("入库失败！");
       }
       return Result.OK("入库成功！");
   }

   /**

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java

@@ -1,24 +1,25 @@
package org.jeecg.modules.lsw.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
* @Description: ç‰©æ–™åº“存信息
@@ -28,7 +29,7 @@
*/
@Api(tags="物料库存信息")
@RestController
@RequestMapping("/lswmaterialinventory/lswMaterialInventory")
@RequestMapping("/lsw/materialInventory")
@Slf4j
public class LswMaterialInventoryController extends JeecgController<LswMaterialInventory, ILswMaterialInventoryService> {
   @Autowired
@@ -37,125 +38,37 @@
   /**
    * åˆ†é¡µåˆ—表查询
    *
    * @param lswMaterialInventory
     * @param materialId
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "物料库存信息-分页列表查询")
   @ApiOperation(value="物料库存信息-分页列表查询", notes="物料库存信息-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<LswMaterialInventory>> queryPageList(LswMaterialInventory lswMaterialInventory,
    public Result<IPage<LswMaterialInventory>> queryPageList(@RequestParam(name = "materialId", defaultValue = "null") String materialId,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<LswMaterialInventory> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterialInventory, req.getParameterMap());
                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LambdaQueryWrapper<LswMaterialInventory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(LswMaterialInventory::getMaterialId, materialId);
        queryWrapper.eq(LswMaterialInventory::getInventoryStatus, MaterialInventoryStatusEnum.NORMAL.name());
        queryWrapper.orderByDesc(LswMaterialInventory::getCreateTime);
       Page<LswMaterialInventory> page = new Page<LswMaterialInventory>(pageNo, pageSize);
       IPage<LswMaterialInventory> pageList = lswMaterialInventoryService.page(page, queryWrapper);
       return Result.OK(pageList);
   }

   /**
    *   æ·»åŠ 
    *
    * @param lswMaterialInventory
    * @return
    */
   @AutoLog(value = "物料库存信息-添加")
   @ApiOperation(value="物料库存信息-添加", notes="物料库存信息-添加")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_inventory:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody LswMaterialInventory lswMaterialInventory) {
       lswMaterialInventoryService.save(lswMaterialInventory);
       return Result.OK("添加成功！");
    @ApiOperation(value = "物料库存信息-统计各线边库物料个数", notes = "物料库存信息-统计各线边库物料个数")
    @GetMapping(value = "/statisticsInventory")
    public Result<String> statisticsInventory(@RequestParam(name = "materialId") String materialId) {
        //库存统计数量
        List<MaterialInventoryStatisticsVO> list = lswMaterialInventoryService.statisticsInventory(materialId);
        if(CollectionUtil.isEmpty(list)){
            return Result.OK("0");
   }

   /**
    *  ç¼–辑
    *
    * @param lswMaterialInventory
    * @return
    */
   @AutoLog(value = "物料库存信息-编辑")
   @ApiOperation(value="物料库存信息-编辑", notes="物料库存信息-编辑")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_inventory:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody LswMaterialInventory lswMaterialInventory) {
       lswMaterialInventoryService.updateById(lswMaterialInventory);
       return Result.OK("编辑成功!");
        StringBuilder sb = new StringBuilder();
        for(MaterialInventoryStatisticsVO vo : list){
            sb.append(vo.getWarehouseName()).append(": ").append(vo.getMaterialQuantity().stripTrailingZeros().toPlainString()).append(" | ");
   }

   /**
    *   é€šè¿‡id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "物料库存信息-通过id删除")
   @ApiOperation(value="物料库存信息-通过id删除", notes="物料库存信息-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_inventory:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       lswMaterialInventoryService.removeById(id);
       return Result.OK("删除成功!");
        return Result.OK(sb.toString());
   }

   /**
    *  æ‰¹é‡åˆ é™¤
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "物料库存信息-批量删除")
   @ApiOperation(value="物料库存信息-批量删除", notes="物料库存信息-批量删除")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_inventory:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.lswMaterialInventoryService.removeByIds(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }

   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "物料库存信息-通过id查询")
   @ApiOperation(value="物料库存信息-通过id查询", notes="物料库存信息-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<LswMaterialInventory> queryById(@RequestParam(name="id",required=true) String id) {
       LswMaterialInventory lswMaterialInventory = lswMaterialInventoryService.getById(id);
       if(lswMaterialInventory==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(lswMaterialInventory);
   }

   /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param lswMaterialInventory
   */
   //@RequiresPermissions("org.jeecg.modules:lsw_material_inventory:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, LswMaterialInventory lswMaterialInventory) {
       return super.exportXls(request, lswMaterialInventory, LswMaterialInventory.class, "物料库存信息");
   }

   /**
     * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
   //@RequiresPermissions("lsw_material_inventory:importExcel")
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, LswMaterialInventory.class);
   }

}

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialOutboundController.java

@@ -7,20 +7,17 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;

/**
* @Description: ç‰©æ–™å‡ºåº“单
@@ -30,7 +27,7 @@
*/
@Api(tags="物料出库单")
@RestController
@RequestMapping("/lswmaterialoutbound/lswMaterialOutbound")
@RequestMapping("/lsw/materialOutbound")
@Slf4j
public class LswMaterialOutboundController extends JeecgController<LswMaterialOutbound, ILswMaterialOutboundService> {
   @Autowired
@@ -45,7 +42,6 @@
    * @param req
    * @return
    */
   //@AutoLog(value = "物料出库单-分页列表查询")
   @ApiOperation(value="物料出库单-分页列表查询", notes="物料出库单-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<LswMaterialOutbound>> queryPageList(LswMaterialOutbound lswMaterialOutbound,
@@ -55,116 +51,6 @@
       QueryWrapper<LswMaterialOutbound> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterialOutbound, req.getParameterMap());
       Page<LswMaterialOutbound> page = new Page<LswMaterialOutbound>(pageNo, pageSize);
       IPage<LswMaterialOutbound> pageList = lswMaterialOutboundService.page(page, queryWrapper);
       return Result.OK(pageList);
   }

   /**
    *   æ·»åŠ 
    *
    * @param lswMaterialOutbound
    * @return
    */
   @AutoLog(value = "物料出库单-添加")
   @ApiOperation(value="物料出库单-添加", notes="物料出库单-添加")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_outbound:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody LswMaterialOutbound lswMaterialOutbound) {
       lswMaterialOutboundService.save(lswMaterialOutbound);
       return Result.OK("添加成功！");
   }

   /**
    *  ç¼–辑
    *
    * @param lswMaterialOutbound
    * @return
    */
   @AutoLog(value = "物料出库单-编辑")
   @ApiOperation(value="物料出库单-编辑", notes="物料出库单-编辑")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_outbound:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody LswMaterialOutbound lswMaterialOutbound) {
       lswMaterialOutboundService.updateById(lswMaterialOutbound);
       return Result.OK("编辑成功!");
   }

   /**
    *   é€šè¿‡id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "物料出库单-通过id删除")
   @ApiOperation(value="物料出库单-通过id删除", notes="物料出库单-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_outbound:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
       lswMaterialOutboundService.removeById(id);
       return Result.OK("删除成功!");
   }

   /**
    *  æ‰¹é‡åˆ é™¤
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "物料出库单-批量删除")
   @ApiOperation(value="物料出库单-批量删除", notes="物料出库单-批量删除")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_outbound:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       this.lswMaterialOutboundService.removeByIds(Arrays.asList(ids.split(",")));
       return Result.OK("批量删除成功!");
   }

   /**
    * é€šè¿‡id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "物料出库单-通过id查询")
   @ApiOperation(value="物料出库单-通过id查询", notes="物料出库单-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<LswMaterialOutbound> queryById(@RequestParam(name="id",required=true) String id) {
       LswMaterialOutbound lswMaterialOutbound = lswMaterialOutboundService.getById(id);
       if(lswMaterialOutbound==null) {
           return Result.error("未找到对应数据");
       }
       return Result.OK(lswMaterialOutbound);
   }

   /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param lswMaterialOutbound
   */
   //@RequiresPermissions("org.jeecg.modules:lsw_material_outbound:exportXls")
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, LswMaterialOutbound lswMaterialOutbound) {
       return super.exportXls(request, lswMaterialOutbound, LswMaterialOutbound.class, "物料出库单");
   }

   /**
     * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
   //@RequiresPermissions("lsw_material_outbound:importExcel")
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
       return super.importExcel(request, response, LswMaterialOutbound.class);
   }
    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(LswMaterialOutbound lswMaterialOutbound,
                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                     HttpServletRequest req){
        IPage<Map<String, Object>> pageList = lswMaterialOutboundService.getlswMaterialOutboundListData(pageNo,pageSize,req);
        return Result.OK(pageList);
    }


 src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java

@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java

@@ -57,6 +57,12 @@
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    @Excel(name = "来源编码", width = 15)
    @ApiModelProperty(value = "来源编码")
    private String originalCode;
    @Excel(name = "来源名称", width = 15)
    @ApiModelProperty(value = "来源名称")
    private String originalName;
    /**产线ID*/
    @Excel(name = "产线ID", width = 15)
    @ApiModelProperty(value = "产线ID")
@@ -83,9 +89,15 @@
    @Excel(name = "入库数量", width = 15)
    @ApiModelProperty(value = "入库数量")
    private BigDecimal quantity;
    /**入库类型*/
    @Excel(name = "入库类型", width = 15)
    @ApiModelProperty(value = "入库类型")
    @Dict(dicCode = "material_inbound_category")
    private String inboundCategory;
    /**接收人*/
    @Excel(name = "接收人", width = 15)
    @ApiModelProperty(value = "接收人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String receiver;
    /**接收时间*/
    @Excel(name = "接收时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java

@@ -1,7 +1,6 @@
package org.jeecg.modules.lsw.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -13,7 +12,6 @@
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -42,14 +40,6 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建日期")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**物料ID*/
    @ApiModelProperty(value = "物料ID")
    private String materialId;
@@ -60,32 +50,36 @@
    /**库存类型*/
    @Excel(name = "库存类型", width = 15)
    @ApiModelProperty(value = "库存类型")
    @Dict(dicCode = "material_inventory_category")
    private String inventoryCategory;
    /**数量*/
    @Excel(name = "数量", width = 15)
    @ApiModelProperty(value = "数量")
    private BigDecimal quantity;
    /**库存地ID*/
    @Excel(name = "库存地ID", width = 15)
    @Excel(name = "库存地", width = 15)
    @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
    @ApiModelProperty(value = "库存地ID")
    private String warehouseId;
    @TableField(exist = false)
    @ApiModelProperty(value = "库存地")
    private String warehouseName;
    private String warehouseId;
    /**库存状态*/
    @Excel(name = "库存状态", width = 15)
    @ApiModelProperty(value = "库存状态")
    @Dict(dicCode = "material_inventory_status")
    private String inventoryStatus;
    /**热处理标识*/
    @Excel(name = "热处理标识", width = 15)
    @ApiModelProperty(value = "热处理标识")
    private String heatTreatmentFlag;

    public LswMaterialInventory(){}

    public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory) {
    public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory, String heatTreatmentFlag) {
        this.warehouseId = inbound.getWarehouseId();
        this.quantity = inbound.getQuantity();
        this.batchNumber = inbound.getBatchNumber();
        this.inventoryStatus = MaterialInventoryStatusEnum.NORMAL.name();
        this.inventoryCategory = inventoryCategory;
        this.materialId = materialId;
        this.heatTreatmentFlag = heatTreatmentFlag;
    }
}

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java

@@ -68,7 +68,6 @@
    /**产线ID*/
    @Excel(name = "产线ID", width = 15)
    @ApiModelProperty(value = "产线ID")
    @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
    private String factoryId;
    /**库存ID*/
    @Excel(name = "库存ID", width = 15)
@@ -77,6 +76,7 @@
    /**线边库ID*/
    @Excel(name = "线边库ID", width = 15)
    @ApiModelProperty(value = "线边库ID")
    @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
    private String warehouseId;
    /**批次号*/
    @Excel(name = "批次号", width = 15)
@@ -85,6 +85,7 @@
    /**出库人*/
    @Excel(name = "出库人", width = 15)
    @ApiModelProperty(value = "出库人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String outboundStaff;
    /**出库时间*/
    @Excel(name = "出库时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -96,4 +97,9 @@
    @Excel(name = "出库数量", width = 15)
    @ApiModelProperty(value = "出库数量")
    private BigDecimal quantity;
    /**出库类型*/
    @Excel(name = "出库类型", width = 15)
    @ApiModelProperty(value = "出库类型")
    @Dict(dicCode = "material_outbound_category")
    private String outboundCategory;
}

 src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java

@@ -4,6 +4,8 @@
    FINISHED_PRODUCT, //成品
    OUTER_FLANGE, //外法兰
    INNER_FLANGE, //内法兰
    SMALL_INNER_RING, //小内圈
    STEEL_BALL, //钢球
    COMPONENTS, //配件
    BLANK; //毛坯


 src/main/java/org/jeecg/modules/lsw/enums/MaterialInboundCategory.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package org.jeecg.modules.lsw.enums;

public enum MaterialInboundCategory {
    MATERIAL_TRANSFER_REQUEST, //物料拉动
    PRODUCTION_INBOUND,//生产下线
    HEAT_TREATMENT_INBOUND,//热处理
    SMALL_INNER_RING,//小内圈
    MATERIAL_INNER_TRANSFER, //内部调拨
    PRODUCTION_UNLOADING, //下料
    ;
}

 src/main/java/org/jeecg/modules/lsw/enums/MaterialInventoryCategoryEnum.java

@@ -3,5 +3,6 @@
public enum MaterialInventoryCategoryEnum {
    INBOUND, //入库
    UNLOADING, //下料
    TRANSFER, //调拨
    ;
}

 src/main/java/org/jeecg/modules/lsw/enums/MaterialOutboundCategory.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package org.jeecg.modules.lsw.enums;

public enum MaterialOutboundCategory {
    MATERIAL_LOADING, //上料
    WAREHOUSE_TRANSFER, //移库
    MATERIAL_INNER_TRANSFER, //内部调拨
    ;
}

 src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java

@@ -4,6 +4,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;

import java.util.List;

@@ -15,22 +16,13 @@
 */
public interface LswMaterialInventoryMapper extends BaseMapper<LswMaterialInventory> {

    /**
     * é€šè¿‡ä¸»è¡¨id删除子表数据
     *
     * @param mainId ä¸»è¡¨id
     * @return boolean
     */
    public boolean deleteByMainId(@Param("mainId") String mainId);

  /**
   * é€šè¿‡ä¸»è¡¨id查询子表数据
   *
   * @param mainId ä¸»è¡¨id
   * @return List<LswMaterialInventory>
   */
    public List<LswMaterialInventory> selectByMainId(@Param("mainId") String mainId);

    List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(@Param("materialNumberList") List<String> bomMaterialNumberList,
                                                                                 @Param("factoryId") String factoryId);

    /**
     * åº“存统计
     * @param materialId
     * @return
     */
    List<MaterialInventoryStatisticsVO> statisticsInventory(@Param("materialId") String materialId);
}

 src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialMapper.java

@@ -1,11 +1,7 @@
package org.jeecg.modules.lsw.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.lsw.entity.LswMaterial;

import java.util.Map;

/**
 * @Description: çº¿è¾¹åº“物料信息
@@ -14,5 +10,5 @@
 * @Version: V1.0
 */
public interface LswMaterialMapper extends BaseMapper<LswMaterial> {
    IPage<Map<String, Object>> getLswMaterialListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);

}

 src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml

@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper">

    <delete id="deleteByMainId" parameterType="java.lang.String">
        DELETE 
        FROM  lsw_material_inventory 
        WHERE
             material_id = #{mainId}     </delete>
	
    <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.lsw.entity.LswMaterialInventory">
        SELECT * 
        FROM  lsw_material_inventory
        WHERE
             material_id = #{mainId}     </select>
    <select id="selectLineSideMaterialInventoryByMaterialNumber"
            resultType="org.jeecg.modules.lsw.vo.LswMaterialInventoryVo">
        SELECT
@@ -31,4 +19,14 @@
            t1.material_number,
            t1.material_name
    </select>
    <select id="statisticsInventory" resultType="org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO">
        select m1.warehouse_id, m2.warehouse_name, m1.materialQuantity
        from (select warehouse_id, SUM(quantity) as materialQuantity
              from lsw_material_inventory
              where material_id = #{materialId}
              and inventory_status = 'NORMAL'
              group by warehouse_id) m1
        left join base_line_side_warehouse m2 on m1.warehouse_id = m2.id

    </select>
</mapper>

 src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialMapper.xml

@@ -1,19 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.lsw.mapper.LswMaterialMapper">
    <select id="getLswMaterialListData" parameterType="Map" resultType="Map">
        select * from lsw_material WHERE 1=1
        <if test="params.materialNumber != null and params.materialNumber != ''">
            AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
        </if>
        <if test="params.materialName != null and params.materialName != ''">
            AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
        </if>
        <if test="params.materialModel != null and params.materialModel != ''">
            AND material_model LIKE CONCAT('%', #{params.materialModel}, '%')
        </if>
        <if test="params.materialCategory != null and params.materialCategory != ''">
            AND material_category = #{params.materialCategory}
        </if>
    </select>
</mapper>

 src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInventoryService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;

import java.util.List;

@@ -13,14 +14,22 @@
 * @Version: V1.0
 */
public interface ILswMaterialInventoryService extends IService<LswMaterialInventory> {

    /**
     * é€šè¿‡ä¸»è¡¨id查询子表数据
     *
     * @param mainId ä¸»è¡¨id
     * @return List<LswMaterialInventory>
     */
    public List<LswMaterialInventory> selectByMainId(String mainId);
    /** é€šè¿‡ç‰©æ–™ç¼–码和线边库id查询物料库存 */
    List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId);

    /**
     * åº“存统计
     * @param materialId ç‰©æ–™ID
     * @return
     */
    List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId);

    /**
     * æŸ¥è¯¢æœªå‡ºåº“信息
     * @param materialNumber
     * @param batchNumber
     * @param warehouseId
     * @return
     */
    LswMaterialInventory queryByMaterialNumberAndBatchNumber(String materialNumber, String batchNumber, String warehouseId);
}

 src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java

@@ -1,12 +1,10 @@
package org.jeecg.modules.lsw.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.sap.dto.OrderBomDTO;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;

@@ -17,9 +15,6 @@
 * @Version: V1.0
 */
public interface ILswMaterialService extends IService<LswMaterial> {


    IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req);

    /**
     * ç¼–辑物料信息

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInboundServiceImpl.java

@@ -5,12 +5,20 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import org.jeecg.modules.lsw.enums.MaterialInboundCategory;
import org.jeecg.modules.lsw.enums.MaterialInventoryCategoryEnum;
import org.jeecg.modules.lsw.enums.MaterialOutboundCategory;
import org.jeecg.modules.lsw.mapper.LswMaterialInboundMapper;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +41,10 @@
    private ILswMaterialInventoryService inventoryService;
    @Autowired
    private ILswMaterialService materialService;
    @Autowired
    private ILineSideWarehouseService lineSideWarehouseService;
    @Autowired
    private ILswMaterialOutboundService materialOutboundService;

    @Override
    public IPage<Map<String, Object>> getlswMaterialInboundListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
@@ -60,20 +72,67 @@
                || StringUtils.isBlank(materialInbound.getFactoryId())
                || StringUtils.isBlank(materialInbound.getWarehouseId())
                || materialInbound.getQuantity() == null
                || materialInbound.getQuantity().intValue() > 0
                || StringUtils.isBlank(materialInbound.getBatchNumber())) {
            return false;
                || materialInbound.getQuantity().intValue() < 1
                || StringUtils.isBlank(materialInbound.getBatchNumber())
                || StringUtils.isBlank(materialInbound.getOriginalCode())
                || StringUtils.isBlank(materialInbound.getOriginalName())
                || StringUtils.isBlank(materialInbound.getInboundCategory())) {
            throw new JeecgBootException("参数错误！");
        }
        LswMaterial material = materialService.queryByMaterialNumber(materialInbound.getMaterialNumber());
        if(material == null) {
            return false;
            throw new JeecgBootException("物料编号不存在！");
        }
        LineSideWarehouse warehouse = lineSideWarehouseService.getById(materialInbound.getWarehouseId());
        if (warehouse == null) {
            throw new JeecgBootException("线边库不存在！");
        }
        String heatTreatmentFlag = CommonConstant.STATUS_0;
        if (materialInbound.getInboundCategory().equals(MaterialInboundCategory.HEAT_TREATMENT_INBOUND.name())) {
            heatTreatmentFlag = CommonConstant.STATUS_1;
        }
        //库存类型
        String inventoryCategory = MaterialInventoryCategoryEnum.INBOUND.name();
        if (materialInbound.getInboundCategory().equals(MaterialInboundCategory.MATERIAL_INNER_TRANSFER.name())) {
            inventoryCategory = MaterialInventoryCategoryEnum.TRANSFER.name();
            //查询来源线边库
            LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByWarehouseCode(materialInbound.getOriginalCode());
            if (lineSideWarehouse == null) {
                throw new JeecgBootException("未找到来源线边库！");
            }
            //调拨 å‡ºåº“原始库存
            LswMaterialInventory originalInventory = inventoryService.queryByMaterialNumberAndBatchNumber(materialInbound.getMaterialNumber(), materialInbound.getBatchNumber(), lineSideWarehouse.getId());
            if (originalInventory == null) {
                throw new JeecgBootException("未找到来源线边库库存！");
            }
            if (materialInbound.getQuantity().compareTo(originalInventory.getQuantity()) != 0) {
                throw new JeecgBootException("调拨数量需要等于来源库存数量！");
            }
            //出库信息
            LswMaterialOutbound outbound = new LswMaterialOutbound();
            outbound.setWarehouseId(lineSideWarehouse.getId());
            outbound.setFactoryId(lineSideWarehouse.getFactoryId());
            outbound.setOutboundStaff(materialInbound.getReceiver());
            outbound.setMaterialName(materialInbound.getMaterialName());
            outbound.setMaterialNumber(materialInbound.getMaterialNumber());
            outbound.setQuantity(originalInventory.getQuantity());
            outbound.setBatchNumber(originalInventory.getBatchNumber());
            outbound.setInventoryId(originalInventory.getId());
            outbound.setOutboundCategory(MaterialOutboundCategory.MATERIAL_INNER_TRANSFER.name());
            //调拨出库
            boolean b = materialOutboundService.outboundMaterial(outbound);
            if (!b) {
                throw new JeecgBootException("调拨出库失败！");
            }
        } else if (materialInbound.getInboundCategory().equals(MaterialInboundCategory.PRODUCTION_UNLOADING.name())) {
            inventoryCategory = MaterialInventoryCategoryEnum.UNLOADING.name();
        }
        //保存入库信息
        materialInbound.setDelFlag(CommonConstant.DEL_FLAG_0);
        materialInbound.setReceiveTime(new Date());
        super.save(materialInbound);
        //保存库存信息
        LswMaterialInventory lswMaterialInventory = new LswMaterialInventory(materialInbound, material.getId(), material.getMaterialCategory());
        LswMaterialInventory lswMaterialInventory = new LswMaterialInventory(materialInbound, material.getId(), inventoryCategory, heatTreatmentFlag);
        inventoryService.save(lswMaterialInventory);
        return true;
    }

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java

@@ -1,14 +1,18 @@
package org.jeecg.modules.lsw.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

/**
@@ -22,14 +26,30 @@
    
    @Autowired
    private LswMaterialInventoryMapper lswMaterialInventoryMapper;
	
    @Override
    public List<LswMaterialInventory> selectByMainId(String mainId) {
        return lswMaterialInventoryMapper.selectByMainId(mainId);
    }
    @Autowired
    private ILswMaterialService materialService;

    @Override
    public List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId) {
        return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId);
    }

    @Override
    public List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId) {
        return lswMaterialInventoryMapper.statisticsInventory(materialId);
    }

    @Override
    public LswMaterialInventory queryByMaterialNumberAndBatchNumber(String materialNumber, String batchNumber, String warehouseId) {
        LswMaterial material = materialService.queryByMaterialNumber(materialNumber);
        if (material == null) {
            return null;
        }
        LambdaQueryWrapper<LswMaterialInventory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(LswMaterialInventory::getWarehouseId, warehouseId);
        queryWrapper.eq(LswMaterialInventory::getMaterialId, material.getId());
        queryWrapper.eq(LswMaterialInventory::getBatchNumber, batchNumber);
        queryWrapper.eq(LswMaterialInventory::getInventoryStatus, MaterialInventoryStatusEnum.NORMAL.name());
        return lswMaterialInventoryMapper.selectOne(queryWrapper);
    }
}

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialOutboundServiceImpl.java

@@ -62,7 +62,7 @@
                || StringUtils.isBlank(outbound.getFactoryId())
                || StringUtils.isBlank(outbound.getWarehouseId())
                || outbound.getQuantity() == null
                || outbound.getQuantity().intValue() > 0
                || outbound.getQuantity().intValue() < 1
                || StringUtils.isBlank(outbound.getBatchNumber())
        || StringUtils.isBlank(outbound.getInventoryId())) {
            return false;

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java

@@ -2,28 +2,21 @@

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper;
import org.jeecg.modules.lsw.mapper.LswMaterialMapper;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.sap.dto.OrderBomDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @Description: çº¿è¾¹åº“物料信息
@@ -33,33 +26,6 @@
 */
@Service
public class LswMaterialServiceImpl extends ServiceImpl<LswMaterialMapper, LswMaterial> implements ILswMaterialService {

    @Autowired
    private LswMaterialMapper lswMaterialMapper;
    @Autowired
    private LswMaterialInventoryMapper lswMaterialInventoryMapper;

    @Override
    public IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("materialModel") && StringUtils.isNotBlank(parameterMap.get("materialModel")[0])) {
                paramMap.put("materialModel", parameterMap.get("materialModel")[0].trim());
            }
            if (parameterMap.containsKey("materialCategory") && StringUtils.isNotBlank(parameterMap.get("materialCategory")[0])) {
                paramMap.put("materialCategory", parameterMap.get("materialCategory")[0].trim());
            }
        }
        return super.getBaseMapper().getLswMaterialListData(pageData, paramMap);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)

 src/main/java/org/jeecg/modules/lsw/vo/LswMaterialPage.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/lsw/vo/MaterialInventoryStatisticsVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package org.jeecg.modules.lsw.vo;

import lombok.Data;

import java.math.BigDecimal;

@Data
public class MaterialInventoryStatisticsVO {
    //库存地ID
    private String warehouseId;
    //库存地名称
    private String warehouseName;
    //库存总数
    private BigDecimal materialQuantity;
}

 src/main/java/org/jeecg/modules/wms/MESObjectFactory.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java

@@ -1,7 +1,6 @@
package org.jeecg.modules.wms.config;

import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBus;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.jeecg.modules.wms.service.MESWebServiceSoap;
@@ -16,12 +15,9 @@
@Configuration
public class WebServiceServerConfig {
    @Autowired
    private MESWebServiceSoap webServiceSoap;

    @Bean(name = Bus.DEFAULT_BUS_ID)
    public Bus springBus() {
        return new SpringBus();
    }
    private Bus bus;
    @Autowired
    private MESWebServiceSoap mesWebServiceSoap;

    @Bean(name = "cxfServlet")  // æ³¨å…¥servlet bean name不能dispatcherServlet ,否则会覆盖dispatcherServlet
    public ServletRegistrationBean<CXFServlet> cxfServlet() {
@@ -31,9 +27,10 @@
    @Bean
    public Endpoint endpoint() {
        // å‚数二，是SEI实现类对象
        Endpoint endpoint = new EndpointImpl(this.springBus(), webServiceSoap);
        Endpoint endpoint = new EndpointImpl(bus, mesWebServiceSoap);
        // å‘布服务
        endpoint.publish("/MESWebService");

        return endpoint;
    }
}

 src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java

@@ -5,7 +5,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.wms.dto.WSResponse;
import org.jeecg.modules.wms.dto.MESResponse;
import org.jeecg.modules.wms.request.*;
import org.jeecg.modules.wms.service.MESWebServiceSoap;
import org.jeecg.modules.wms.service.WMSWebServiceClient;
@@ -35,7 +35,7 @@
        MESWebServiceSoap service = (MESWebServiceSoap) factory.create();
        ReceiveWMSScanItemList request = new ReceiveWMSScanItemList();
        request.setWmsWebServiceSendItemList(list);
        WSResponse response = service.receiveWMSScanItemList(request);
        MESResponse response = service.receiveWMSScanItemList(request);
        return Result.ok(response);
    }


 src/main/java/org/jeecg/modules/wms/dto/MESResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.jeecg.modules.wms.dto;

import lombok.Getter;
import lombok.Setter;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;

@Getter
@Setter
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "MESResponse",  propOrder = {
        "errorCode",
        "errorDesc"
}, namespace = "http://xhj008.server.webservice.com/")
public class MESResponse {
    @XmlElement(name = "ErrorCode", namespace = "http://xhj008.server.webservice.com/")
    protected String errorCode;
    @XmlElement(name = "ErrorDesc", namespace = "http://xhj008.server.webservice.com/")
    protected String errorDesc;
}

 src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java

@@ -8,11 +8,11 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
        "receiveWMSScanItemListResult"
})
@XmlRootElement(name = "ReceiveWMSScanItemListResponse")
}, namespace = "http://xhj008.server.webservice.com/")
@XmlRootElement(name = "ReceiveWMSScanItemListResponse", namespace = "http://xhj008.server.webservice.com/")
@Getter
@Setter
public class ReceiveWMSScanItemListResponse {
    @XmlElement(name = "ReceiveWMSScanItemListResult")
    protected WSResponse receiveWMSScanItemListResult;
    @XmlElement(name = "ReceiveWMSScanItemListResult", namespace = "http://xhj008.server.webservice.com/")
    protected MESResponse receiveWMSScanItemListResult;
}

 src/main/java/org/jeecg/modules/wms/request/ReceiveWMSScanItemList.java

@@ -9,13 +9,13 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
        "wmsWebServiceSendItemList"
})
@XmlRootElement(name = "ReceiveWMSScanItemList")
}, namespace = "http://xhj008.server.webservice.com/")
@XmlRootElement(name = "ReceiveWMSScanItemList", namespace = "http://xhj008.server.webservice.com/")
@Getter
@Setter
public class ReceiveWMSScanItemList {

    @XmlElementWrapper(name = "ArrayOfWMSWebServiceSendItem")
    @XmlElement(name = "WMSWebServiceSendItem", nillable = true)
    @XmlElementWrapper(name = "ArrayOfWMSWebServiceSendItem", namespace = "http://xhj008.server.webservice.com/")
    @XmlElement(name = "WMSWebServiceSendItem", nillable = true, namespace = "http://xhj008.server.webservice.com/")
    protected List<WMSWebServiceSendItem> wmsWebServiceSendItemList;
}

 src/main/java/org/jeecg/modules/wms/request/WMSWebServiceSendItem.java

@@ -31,62 +31,62 @@
        "stageID",
        "remark",
        "orderCode"
})
}, namespace = "http://xhj008.server.webservice.com/")
@XmlAccessorType(XmlAccessType.FIELD)
public class WMSWebServiceSendItem {

    /**工厂编码 */
    @XmlElement(name = "FactoryCode")
    @XmlElement(name = "FactoryCode", namespace = "http://xhj008.server.webservice.com/")
    private String factoryCode;
    /** ç‰©æ–™ç¼–码 */
    @XmlElement(name = "SkuCode")
    @XmlElement(name = "SkuCode", namespace = "http://xhj008.server.webservice.com/")
    private String skuCode;
    /** é¢„留号 */
    @XmlElement(name = "ReservationOrder")
    @XmlElement(name = "ReservationOrder", namespace = "http://xhj008.server.webservice.com/")
    private String reservationOrder;
    /** MES移库单号 */
    @XmlElement(name = "Align")
    @XmlElement(name = "Align", namespace = "http://xhj008.server.webservice.com/")
    private String align;
    /** æ‰˜å· */
    @XmlElement(name = "Pallet")
    @XmlElement(name = "Pallet", namespace = "http://xhj008.server.webservice.com/")
    private String pallet;
    /** åŒ…装编码 */
    @XmlElement(name = "PackageNo")
    @XmlElement(name = "PackageNo", namespace = "http://xhj008.server.webservice.com/")
    private String packageNo;
    /** æ‰¹æ¬¡å· */
    @XmlElement(name = "TrackLot")
    @XmlElement(name = "TrackLot", namespace = "http://xhj008.server.webservice.com/")
    private String trackLot;
    /** ç³»åˆ—号 */
    @XmlElement(name = "Series")
    @XmlElement(name = "Series", namespace = "http://xhj008.server.webservice.com/")
    private String series;
    /** MES库存ID */
    @XmlElement(name = "MesStockID")
    @XmlElement(name = "MesStockID", namespace = "http://xhj008.server.webservice.com/")
    private String mesStockID;
    /** æ•°é‡ */
    @XmlElement(name = "Quantity")
    @XmlElement(name = "Quantity", namespace = "http://xhj008.server.webservice.com/")
    private BigDecimal quantity;
    /** SAP批次号 */
    @XmlElement(name = "SapTrackLot")
    @XmlElement(name = "SapTrackLot", namespace = "http://xhj008.server.webservice.com/")
    private String sapTrackLot;
    /** å‘送库存地 */
    @XmlElement(name = "Section")
    @XmlElement(name = "Section", namespace = "http://xhj008.server.webservice.com/")
    private String section;
    /** ç›®æ ‡åº“存地 */
    @XmlElement(name = "DestSection")
    @XmlElement(name = "DestSection", namespace = "http://xhj008.server.webservice.com/")
    private String destSection;
    /** ä¾›åº”商代码 */
    @XmlElement(name = "SupplierCode")
    @XmlElement(name = "SupplierCode", namespace = "http://xhj008.server.webservice.com/")
    private String supplierCode;
    /** ä¾›åº”商批次号 */
    @XmlElement(name = "SupplierTrackLot")
    @XmlElement(name = "SupplierTrackLot", namespace = "http://xhj008.server.webservice.com/")
    private String supplierTrackLot;
    /** é˜¶æ®µID */
    @XmlElement(name = "StageID")
    @XmlElement(name = "StageID", namespace = "http://xhj008.server.webservice.com/")
    private String stageID;
    /** å¤‡æ³¨ */
    @XmlElement(name = "Remark")
    @XmlElement(name = "Remark", namespace = "http://xhj008.server.webservice.com/")
    private String remark;
    /** è®¢å•ç¼–码 */
    @XmlElement(name = "OrderCode")
    @XmlElement(name = "OrderCode", namespace = "http://xhj008.server.webservice.com/")
    private String orderCode;
}

 src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java

@@ -1,28 +1,27 @@
package org.jeecg.modules.wms.service;

import org.jeecg.modules.wms.MESObjectFactory;
import org.jeecg.modules.wms.dto.WSResponse;
import org.jeecg.modules.wms.dto.MESResponse;
import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;

import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;

@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com/")
@XmlSeeAlso({MESObjectFactory.class})
public interface MESWebServiceSoap {
    /**
     * æŽ¥æ”¶WMS移库信息
     * @param request
     * @param wmsWebServiceSendItemList
     * @return
     */
    @WebMethod(operationName = "ReceiveWMSScanItemList", action = "http://xhj008.server.webservice.com/ReceiveWMSScanItemList")
    @RequestWrapper(localName = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemList")
    @ResponseWrapper(localName = "ReceiveWMSScanItemListResponse", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemListResponse")
    @WebResult(name = "ReceiveWMSScanItemListResult", targetNamespace = "http://xhj008.server.webservice.com/")
    WSResponse receiveWMSScanItemList(@WebParam(name = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/") ReceiveWMSScanItemList request);
    MESResponse receiveWMSScanItemList(
            @WebParam(name = "wmsWebServiceSendItemList", targetNamespace = "http:/xhj008.server.webservice.com/")
            ReceiveWMSScanItemList wmsWebServiceSendItemList);
}

 src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java

@@ -11,6 +11,7 @@
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import org.jeecg.modules.lsw.enums.MaterialInboundCategory;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
@@ -21,7 +22,7 @@
import org.jeecg.modules.mes.enums.TransferOrderStatusEnum;
import org.jeecg.modules.mes.service.IMesMaterialTransferRequestService;
import org.jeecg.modules.mes.service.IMesTransferOrderPrintService;
import org.jeecg.modules.wms.dto.WSResponse;
import org.jeecg.modules.wms.dto.MESResponse;
import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;
import org.jeecg.modules.wms.request.WMSWebServiceSendItem;
import org.jeecg.modules.wms.service.MESWebServiceSoap;
@@ -29,17 +30,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
import java.math.BigDecimal;


@Slf4j
@Service
@Service("MESWebServiceSoap")
@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com", endpointInterface = "org.jeecg.modules.wms.service.MESWebServiceSoap")
public class MESWebServiceSoapImpl implements MESWebServiceSoap {

@@ -60,13 +56,9 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    @WebMethod(operationName = "ReceiveWMSScanItemList", action = "http://xhj008.server.webservice.com/ReceiveWMSScanItemList")
    @RequestWrapper(localName = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemList")
    @ResponseWrapper(localName = "ReceiveWMSScanItemListResponse", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemListResponse")
    @WebResult(name = "ReceiveWMSScanItemListResult", targetNamespace = "http://xhj008.server.webservice.com/")
    @ApiLog(apiName = "接收WMS的移库信息(ReceiveWMSScanItemList(MES)", apiCategory = ApiLogCategoryEnum.WMS)
    public WSResponse receiveWMSScanItemList(@WebParam(name = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/") ReceiveWMSScanItemList request) {
        WSResponse response = new WSResponse();
    public MESResponse receiveWMSScanItemList(ReceiveWMSScanItemList request) {
        MESResponse response = new MESResponse();
        if (request == null || CollectionUtil.isEmpty(request.getWmsWebServiceSendItemList())) {
            response.setErrorCode("N");
            response.setErrorDesc("传入的参数为空！");
@@ -107,6 +99,8 @@

                //添加入库信息
                LswMaterialInbound inbound = new LswMaterialInbound();
                inbound.setOriginalCode(transferRequest.getOriginalWarehouseId());
                inbound.setOriginalName("WMS");
                inbound.setWarehouseId(transferRequest.getTargetWarehouseId());
                inbound.setReceiver("WMS");
                inbound.setMaterialNumber(transferRequest.getMaterialNumber());
@@ -114,6 +108,7 @@
                inbound.setBatchNumber(item.getTrackLot());
                inbound.setQuantity(item.getQuantity());
                inbound.setFactoryId(warehouse.getFactoryId());
                inbound.setInboundCategory(MaterialInboundCategory.MATERIAL_TRANSFER_REQUEST.name());
                boolean b = materialInboundService.inboundMaterial(inbound);
                if (!b) {
                    errorCount++;