商品表 商品编号字段修改

ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue

@@ -257,7 +257,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'workOrderId',text:'工单编号',dictCode:'zy_work_order,code,id'})
-        fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_num,id'})
+        fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_code,id'})
         fieldList.push({type:'string',value:'workshopId',text:'车间',dictCode:''})
         fieldList.push({type:'string',value:'factory',text:'工厂',dictCode:''})
         fieldList.push({type:'string',value:'teamId',text:'班组',dictCode:''})

ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue

@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
-              <j-dict-select-tag type="list" v-model="model.goodsId" dictCode="zy_goods,goods_num,id" placeholder="请选择商品" />
+              <j-dict-select-tag type="list" v-model="model.goodsId" dictCode="zy_goods,goods_code,id" placeholder="请选择商品" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -151,7 +151,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }

ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue

@@ -178,7 +178,8 @@ export default {
   methods: {
     fanHui() {
       this.$router.push({
-        path: '/src/views/team/GroupxList',
+        //这里的路径是要返回的对应菜单的路由配置地址
+        path: '/team/GroupxList',
       });
     },
     // initDictConfig() {

ant-design-vue-jeecg/src/views/team/StationMachineList.vue

@@ -179,7 +179,7 @@ export default {
   methods: {
     fanHui() {
       this.$router.push({
-        path: '/src/views/team/StationList',
+        path: '/team/StationList',
         // path: '/src/views/zyclothsstyle/ZyClothsStyleList',
       });
     },

ant-design-vue-jeecg/src/views/team/StationToolList.vue

@@ -177,7 +177,7 @@ export default {
   methods: {
     fanHui() {
       this.$router.push({
-        path: '/src/views/team/StationList',
+        path: '/team/StationList',
         // path: '/src/views/zyclothsstyle/ZyClothsStyleList',
       });
     },

jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java

@@ -40,8 +40,8 @@ public class ZyProductionTypesetting implements Serializable {
     @ApiModelProperty(value = "工单编号")
     private String workOrderId;
 	/**商品*/
-	@Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_num", dicCode = "id")
+	@Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_code", dicCode = "id")
-	@Dict(dictTable = "zy_goods", dicText = "goods_num", dicCode = "id")
+	@Dict(dictTable = "zy_goods", dicText = "goods_code", dicCode = "id")
     @ApiModelProperty(value = "商品")
     private String goodsId;
 	/**车间*/

jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java

@@ -32,7 +32,7 @@ public class ZyGoods implements Serializable {
     /**商品编号*/
     @Excel(name = "商品编号", width = 15)
     @ApiModelProperty(value = "商品编号")
-    private java.lang.String goodsNum;
+    private java.lang.String goodsCode;
     /**商品来源*/
     @Excel(name = "商品来源", width = 15)
     @ApiModelProperty(value = "商品来源")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java

@@ -107,7 +107,7 @@ public class ZyWorkOrderController extends JeecgController<ZyWorkOrder, IZyWorkO
         ZyWorkOrder zyWorkOrder = zyWorkOrderService.getById(zyProductionTypesetting.getWorkOrderId());
         ZyGoods zyGoods = zyGoodsService.getById(zyProductionTypesetting.getGoodsId());
         zyProductionTypesetting.setWorkOrderId(zyWorkOrder.getOrderCode());
-        zyProductionTypesetting.setGoodsId(zyGoods.getGoodsNum());
+        zyProductionTypesetting.setGoodsId(zyGoods.getGoodsCode());
         return Result.OK(zyProductionTypesetting);
     }