Merge remote-tracking branch 'origin/master'

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>