Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-manage into demo_

platform-dao/src/main/resources/mapper/repair/RepairFeeMapper.xml

@@ -82,6 +82,7 @@
             <if test="feeDateEnd != null">
                 and fee.fee_date <![CDATA[ <= ]]> #{feeDateEnd}
             </if>
+
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object" resultType="com.platform.dao.entity.repair.RepairFee">

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -382,11 +382,15 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
             detail.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
             detail.setCreatedUserName(SecurityUtils.getUserInfo().getUsername());
             detail.setSbId(sbIds.get(i));
-            detail.setSortNum(sortNums.get(i));
+            if (sortNums.get(i)!=null) {
+                detail.setSortNum(sortNums.get(i));
+            }else {
+                detail.setSortNum(100);
+            }
             detail.setTaskId(taskId);
             detail.setId(IdGeneratorUtils.getObjectId());
             detail.setStatus(0);
-            detail.setSortNum(100);
+
             details.add(detail);
         }
 //        for(String sbId : sbIds){

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -70,7 +70,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
 
     @Override
     public List<OutStoreFormVO> selectbyRepairForm(String id) {
-        List<OutStoreForm> outStoreForms = mapper.select(new OutStoreForm().setRepairFormId(id));
+        List<OutStoreForm> outStoreForms = mapper.select(new OutStoreForm().setPickId(id));
         List<OutStoreFormVO> outStoreFormVOS = BeanConverterUtil.copyListProperties(outStoreForms,OutStoreFormVO.class);
         List<OutStoreDetailVO> detailVOS;
         if (outStoreFormVOS!=null&&outStoreFormVOS.size()>0) {
@@ -295,10 +295,11 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         }
         model.setStoreId(detailList.get(0).getStoreId());
         model.setStoreName(detailList.get(0).getStoreName());
+        model.setPickId(model.getPickId());
         OutStoreForm outStoreForm = super.saveModelByDTO(model);
         // 插
         for (OutStoreDetailDTO detail : detailList) {
-            detail.setRepairFormId(model.getRepairFormId());
+//            detail.setRepairFormId(model.getRepairFormId());
             detail.setUserInfo(userInfo);
             detail.setOutId(outStoreForm.getId());
             detail.setRealNum(detail.getNum());