Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform

ant-design-vue-jeecg/src/views/shopping/components/billTitle.vue

@@ -34,7 +34,7 @@
         </div>
         <p><span v-if="item.customerType == 1">个人</span><span v-if="item.customerType == 2">企业</span></p>
         <p>
-          {{item.username}}
+          {{item.name}}
         </p>
         <p>{{item.taxIdentificationNumber}}</p>
       </div>
@@ -61,13 +61,23 @@
           :label-col="labelCol" :wrapper-col="wrapperCol"
           class="modelForm"
         >
+          <a-form-model-item label="客户类型" >
+            <a-radio-group v-model="form.customerType">
+              <a-radio :value="'1'">
+                个人
+              </a-radio>
+              <a-radio :value="'2'">
+                企业
+              </a-radio>
+            </a-radio-group>
+          </a-form-model-item>
           <a-form-model-item label="发票类型" >
-            <a-select v-model="form.type" placeholder="请选择发票类型">
+            <a-select v-model="form.invoiceType" placeholder="请选择发票类型">
               <a-select-option value="1">
-                专用发票
+                专用增值税发票
               </a-select-option>
               <a-select-option value="2">
-                普通发票
+                普通增值税发票
               </a-select-option>
             </a-select>
           </a-form-model-item>
@@ -78,16 +88,17 @@
             <a-input  placeholder="请输入发票抬头" v-model="form.name" />
           </a-form-model-item>
           <a-form-model-item
-            label="税号"
+            label="纳税人识别号"
             prop="dutyNum"
           >
-            <a-input  placeholder="请输入税号" v-model="form.dutyNum" />
+            <a-input  placeholder="请输入纳税人识别号" v-model="form.accountNumber" />
           </a-form-model-item>
           <a-form-model-item
             label="公司注册电话"
             prop="phone"
+            v-if="form.customerType == 2"
           >
-            <a-input  placeholder="请输入公司注册电话" v-model="form.phone">
+            <a-input  placeholder="请输入公司注册电话" v-model="form.telephone">
               <template slot="addonBefore">
                 <span>+86 中国大陆地区</span>
               </template>
@@ -96,12 +107,23 @@
           <a-form-model-item
             label="银行账户"
             prop="card"
+            v-if="form.customerType == 2"
           >
-            <a-input  placeholder="请输入银行账户" v-model="form.card">
+            <a-input  placeholder="请输入银行账户" v-model="form.bankDeposit">
             </a-input>
           </a-form-model-item>
-          <a-form-model-item label="公司注册地址" prop="detailed">
+          <a-form-model-item label="开户行"  prop="bankzh">
-            <a-input v-model="form.detailed" type="textarea" />
+            <j-popup
+              v-model="form.bankzh"
+              field="bankzh"
+              org-fields="id,bankname"
+              dest-fields="bankDeposit,bankzh"
+              code="findyh"
+              :multi="true"
+            />
+          </a-form-model-item>
+          <a-form-model-item label="地址" prop="detailed">
+            <a-input v-model="form.address" type="textarea" />
           </a-form-model-item>
           <a-form-model-item>
             <a-checkbox @change="onChange" :checked="form.flag">
@@ -117,7 +139,6 @@
   import { httpAction, getAction } from '@/api/manage'
   import { deleteAction } from '@/api/manage'
 
-
   export default {
     name: "billTitle",
     components: {  },
@@ -132,7 +153,7 @@
         /*billTitle:[
           {
             id:1,
-            type:'1',//发票类型1为专用2为普通
+            type:'1',//发票类型1为专用增值税发票2为普通增值税发票
             name:'易创网络科技有限公司',
             flag:true,//是否默认抬头
             dutyNum:'6974980492840298590',//税号
@@ -193,13 +214,16 @@
         addr1:'210521',
         //弹窗数据
         form: {
+          customerType:'1',//客户类型
           id:'',
-          type: undefined,
+          invoiceType: undefined,
           name: '',
           addr: '',
-          dutyNum: '',
+          accountNumber: '',
           account: '',
-          phone: '',
+          telephone: '',
+          address:'',
+          card:'',
           flag:false//是否默认地址
         },
 
@@ -238,7 +262,7 @@
           if(res.success) {
             this.billTitle = res.result;
             console.log(res.result)
-            this.visible = true;
+            // this.visible = true;
           } else {
           }
         });
@@ -319,13 +343,14 @@
         this.visible = true
         this.flag = 'edit'
         this.form = item
+        console.log(this.form.customerType)
       },
       confirm2(id) {
 
 
         getAction(this.url.szfpmr,{id,id}).then((res) => {
           if(res.success) {
-            this.loadData(1);
+            // this.loadData(1);
           } else {
           }
         });

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java

@@ -271,6 +271,7 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl<ZyProductPlanMapp
 
         //2,保存生产计划
 //        List<ZyProductPlan> productPlanList = this.saveProductPlan(workOrderList);
+        //TODO
         List<ZyProductPlan> productPlanList = this.saveProductPlan4Mock(workOrderList);
         if (ObjectUtils.isEmpty(productPlanList)) return Collections.EMPTY_LIST;
 
@@ -310,7 +311,7 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl<ZyProductPlanMapp
      * 匹配设备&工具&工人
      * <p>
      * 匹配车间工位设备与工序设备，工位设备包含工序设备即匹配成功，匹配失败做异常处理
-     * 匹配车间工位工具与工序工具，工位设备包含工序设备即匹配成功，匹配失败做异常处理
+     * 匹配车间工位工具与工序工具，工位工具包含工序设备即匹配成功，匹配失败做异常处理
      *
      * @param planId
      */

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

@@ -1519,13 +1519,13 @@ public class SysUserController {
     /**
      * 个人中心
      *
-     * @param json
+     * @param
      * @return
      */
     @RequestMapping(value = "/findgoods", method = RequestMethod.GET)
     public Result<?> findgoods() {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String userid = loginUser.getUsername();
+        String userid = loginUser.getId();
         List<Grzx1> gr1 = new ArrayList<>();
         List<Grzx2> gr2 = new ArrayList<>();
         gr1 =sysUserService.getallgr1(userid);
@@ -1535,7 +1535,7 @@ public class SysUserController {
             g2.setOrderNum(gr1.get(i).getOrdersNum());
             g2.setPay(gr1.get(i).getDeliveryStatus());
             g2.setReceipt("false");
-            g2.setUrl(gr1.get(i).getDefaultPicture());
+            g2.setUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+gr1.get(i).getDefaultPicture());
             g2.setName(gr1.get(i).getGoodsName());
             g2.setType(gr1.get(i).getStyleNames());
             g2.setSize(gr1.get(i).getModelNumber());

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -167,7 +167,7 @@
 	<!-- 根据用户名查询 -->
 	<select id="getallgr1" resultType="org.jeecg.modules.system.vo.Grzx1">
 SELECT og.id, zo.orders_num , zg.goods_name , zcs.style_names,zsm.model_number,og.goods_num,zf.name,za.type_name,zg.default_picture,og.pay_total_price,og.unit_price,og.create_time,og.create_by ,
-zo.delivery_status , zo.city_id ,zo.address,zo.zip_code
+zo.delivery_status , zo.city_id ,zo.address,zo.zip_code,zo.user_id
 FROM zy_orders AS zo
 INNER JOIN order_goods AS og ON zo.id = og.orders_id
 LEFT JOIN zy_goods AS zg ON og.goods_id = zg.id
@@ -177,7 +177,7 @@ LEFT JOIN order_goods_fabric AS ogf  ON ogf.order_goods_id = og.id
 LEFT JOIN zy_fabric AS zf  ON ogf.fabric_id = zf.id
 LEFT JOIN order_goods_accessories AS oga ON oga.order_goods_id  = og.id
 LEFT JOIN zy_accessories AS za  ON oga.accessories_id = za.id
-WHERE og.create_by=#{userid}
+WHERE zo.user_id=#{userid}
 	</select>