Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java

@@ -64,10 +64,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
         ResultBean rb = ResultBean.fireFail();
         String brandCode = dto.getBrandCode();//品牌编码
         //查询品牌编码是否有重复的
-        int count = baseVehicleBrandService.selectCountByBrandCode(brandCode);
+        /*int count = baseVehicleBrandService.selectCountByBrandCode(brandCode);
         if (count > 0) {
             return ResultBean.fireFail().setMsg("品牌编码已存在");
-        }
+        }*/
         BaseVehicleBrand entity = new BaseVehicleBrand();
         dto.fillEntity(entity);
         boolean isSave = baseVehicleBrandService.save(entity);
@@ -86,10 +86,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
         }
         String brandCode = dto.getBrandCode();//品牌编码
         //查询品牌编码是否有重复的
-        int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid);
+        /*int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid);
         if (count > 0) {
             return ResultBean.fireFail().setMsg("品牌编码已存在");
-        }
+        }*/
         int i = baseVehicleBrandService.updateBySid(dto.toMap(), sid);
         if (i == 0) {
             return ResultBean.fireFail().setMsg("修改失败");

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -54,6 +54,22 @@ public interface SysOrganizationFeign {
     @GetMapping("/selectChildrenListBySid/{sid}")
     public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("调出一级站-调入当前一级站内所有二级站")
+    @GetMapping("/tranOne/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranOne(@PathVariable("sid") String sid);
+
+    @ApiOperation("调出一级站-调入当前分公司内所有一级站，不包含自身")
+    @GetMapping("/tranTwo/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranTwo(@PathVariable("sid") String sid);
+
+    @ApiOperation("调出一级站-本集团内调入所有一级站，不包含自身")
+    @GetMapping("/tranThree/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranThree(@PathVariable("sid") String sid);
+
+    @ApiOperation("调出二级站-调入上级一级站及站下所有二级站，不包含自身")
+    @GetMapping("/tranfour/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranfour(@PathVariable("sid") String sid);
+
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody SysOrganizationDto dto);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -54,6 +54,26 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return rb.setMsg("接口anrui_portal/sysorganization/selectChildrenListBySid无法访问");
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranOne(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranTwo(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranThree(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranfour(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean save(SysOrganizationDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问");

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java

@@ -90,6 +90,8 @@ public class SysUserVo implements Vo {
 
     private String defaultDeptName;
     private String defaultDeptSid;
+    private String defaultOrgAttributeKey;
+    private String defaultOrgAttributeValue;
 
     @ApiModelProperty("是否需要更换密码")
     private Boolean needResetPsd;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java

@@ -18,4 +18,7 @@ public class OrgList implements Vo {
     private String deptName;
 
     private String deptSid;
+
+    private String orgAttributeKey;
+    private String orgAttributeValue;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -130,4 +130,12 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrgStaffVo> selectByOrgDeptSid2(String orgDeptSid);
 
     List<SysOrganization> selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid);
+
+    List<SysOrganizationVo> tranOne(String sid);
+
+    List<SysOrganizationVo> tranTwo(String sid);
+
+    List<SysOrganizationVo> tranThree(String sid);
+
+    List<SysOrganizationVo> tranfour(String sid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -249,4 +249,77 @@
         where psid = #{pSid}
           and orgCode =#{orgCode}
     </select>
+
+    <select id="tranOne" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE (
+                orgAttributeKey = 'fwz_002'
+                        OR orgAttributeKey = 'fwz_003'
+                )
+          AND psid = #{sid}
+    </select>
+
+    <select id="tranTwo" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE orgAttributeKey = 'fwz_001'
+          AND (
+                psid =
+                (SELECT
+                         psid
+                 FROM
+                         sys_organization
+                 WHERE sid = #{sid})
+                        OR sid =
+                           (SELECT
+                                    psid
+                            FROM
+                                    sys_organization
+                            WHERE sid = #{sid})
+                )
+          AND sid != #{sid}
+    </select>
+
+    <select id="tranThree" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE orgAttributeKey = 'fwz_001'
+          AND sid != #{sid}
+    </select>
+
+    <select id="tranfour" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE sid =
+              (SELECT
+                       psid
+               FROM
+                       sys_organization
+               WHERE sid = #{sid})
+        UNION
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE (
+                orgAttributeKey = 'fwz_002'
+                        OR orgAttributeKey = 'fwz_003'
+                )
+          AND psid =
+              (SELECT
+                       psid
+               FROM
+                       sys_organization
+               WHERE sid = #{sid})
+          AND sid != #{sid}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -109,6 +109,26 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectChildrenListBySid(sid));
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranOne(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranOne(sid));
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranTwo(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranTwo(sid));
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranThree(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranThree(sid));
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranfour(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranfour(sid));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultBean update(SysOrganizationDto dto, String sid) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -719,4 +719,20 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     public List<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid);
     }
+
+    public List<SysOrganizationVo> tranOne(String sid) {
+        return baseMapper.tranOne(sid);
+    }
+
+    public List<SysOrganizationVo> tranTwo(String sid) {
+        return baseMapper.tranTwo(sid);
+    }
+
+    public List<SysOrganizationVo> tranThree(String sid) {
+        return baseMapper.tranThree(sid);
+    }
+
+    public List<SysOrganizationVo> tranfour(String sid) {
+        return baseMapper.tranfour(sid);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java

@@ -61,6 +61,7 @@ public class ScmCollectionRebateQuery implements Query {
     private String createStartTime;
     @ApiModelProperty("创建结束日期")
     private String createEndTime;
+    private String createOrgSid;
 
     private String userSid;
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@@ -123,8 +123,10 @@ public class ScmVehRebateVo implements Vo {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-    @ApiModelProperty("上传状态(2未上传、3已上传)")
+    @ApiModelProperty("上传状态(0未上传、1已上传)")
     private String uploadState; // 上传状态
     @ApiModelProperty("是否可以点击是否调整")
     private Boolean adjustOrNot;
+    @ApiModelProperty("调整状态(1已调整0未调整)")
+    private Integer adjustmentState;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -223,8 +223,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-        qw.eq("createOrgSid", useOrgSid);
+        qw.eq("createOrgSid", query.getCreateOrgSid());
         qw.eq("state", 0);
         if (query.getSidList().size() > 0) {
             qw.notIn("sid", query.getSidList());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -253,15 +253,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         for (ScmVehRebateVo record : pagging.getRecords()) {
             //上传状态：未上传
             if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) {
-                record.setUploadState("2");
+                record.setUploadState("0");
             }
             //上传状态：已上传
-            if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("否")) {
-                record.setUploadState("3");
+            if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) {
+                record.setUploadState("1");
             }
             //是否调整
             if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0){
-                BigDecimal decimal = new BigDecimal(record.getUploadMoney()).subtract(new BigDecimal(record.getMoney())).subtract(new BigDecimal(record.getStayDetermineMoney())).subtract(new BigDecimal(record.getEstimateRebate()));
+                BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
                 int i = decimal.compareTo(BigDecimal.ZERO);
                 if (i < 0){//小于
                     record.setIsAdjustment("否");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -158,6 +158,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (svc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
+        qw.groupBy("svc.sid");
         IPage<ScmVehrebateCheckapply> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
         List<ScmVehrebateCheckapplyVo> records = pagging.getRecords();

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -48,17 +48,24 @@
         <div class="listtop">
           <div class="tit">单车返利待核对列表</div>
           <div>
-            <el-button size="mini" type="success">导入</el-button>
-            <el-button size="mini" type="success">导出</el-button>
+            <el-button size="mini" type="success">一次导出</el-button>
+            <el-button size="mini" type="success">一次导入</el-button>
+            <el-button size="mini" type="success">二次导出</el-button>
+            <el-button size="mini" type="success">二次导入</el-button>
           </div>
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50px"/>
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
-            <el-table-column label="上传状态" align="center" width="200">
+            <el-table-column label="上传状态" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.uploadState == '0' ? '未调整' : scope.row.uploadState == '1' ? '已调整' : scope.row.uploadState == '2' ? '未上传' : scope.row.uploadState == '3' ? '已上传' : ''}}</span>
+                <span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="调整状态" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uploadState == '0' ? '未调整' : scope.row.uploadState == '1' ? '已调整' : ''}}</span>
               </template>
             </el-table-column>
             <el-table-column label="品牌" align="center" width="200">
@@ -113,12 +120,12 @@
             </el-table-column>
             <el-table-column label="上传日期" align="center" width="200">
               <template slot-scope="scope">
-                <el-date-picker v-model="scope.row.uploadDate" type="date" style="width: 160px" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <el-date-picker v-model="scope.row.uploadDate" :disabled="scope.row.secondaryUploadDate !== ''" type="date" style="width: 160px" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </template>
             </el-table-column>
             <el-table-column label="上传金额" align="center" width="150">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.uploadMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.uploadMoney" :disabled="scope.row.secondaryUploadDate !== ''" @input="isAdjustmentInput(scope.row)" @keyup.native="scope.row.uploadMoney = getNumber(scope.row.uploadMoney, 2)" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
             <el-table-column label="二次上传日期" align="center" width="120">
@@ -133,17 +140,17 @@
             </el-table-column>
             <el-table-column label="待确定金额" align="center" width="150">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.stayDetermineMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.stayDetermineMoney" @input="isAdjustmentInput(scope.row)" @keyup.native="scope.row.stayDetermineMoney = getNumber(scope.row.stayDetermineMoney, 2)" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
             <el-table-column label="费用" align="center" width="150">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.money" @keyup.native="UpNumber" @keydown.native="UpNumber" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.money" @input="isAdjustmentInput(scope.row)" @keyup.native="scope.row.money = getNumber(scope.row.money, 2)" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
             <el-table-column label="是否调整" align="center" width="100">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.isAdjustment" :disabled="scope.row.stayDetermineMoney > 0 || (scope.row.stayDetermineMoney == '0' && scope.row.adjustmentMoney == '0')" @change="changeIsAdjustment(scope.row)" placeholder="" filterable>
+                <el-select v-model="scope.row.isAdjustment" :disabled="!scope.row.adjustOrNot" @change="isAdjustmentChange($event, scope.row)" placeholder="" filterable>
                   <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </template>
@@ -155,13 +162,13 @@
             </el-table-column>
             <el-table-column label="调整说明" align="center" width="300">
               <template slot-scope="scope">
-                <el-input :disabled="scope.row.isAdjustment === '' || scope.row.isAdjustment === '否'" v-model="scope.row.adjustmentRemarks" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.adjustmentRemarks" clearable placeholder=""></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180px" >
+            <el-table-column label="操作" align="center" width="180px">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toSave(scope.row)">保存</el-button>
-                <el-button type="primary" :disabled="scope.row.isAdjustment === '' || scope.row.isAdjustment === '是'" size="mini" @click="toAdjust(scope.row)">调整</el-button>
+                <el-button type="primary" v-if="scope.row.adjustmentState == '0'" size="mini" @click="toSave(scope.row)">保存</el-button>
+                <el-button type="primary" v-if="scope.row.isAdjustment == '否' || (scope.row.uploadState == '3' && scope.row.adjustmentState == '0')" size="mini" @click="toAdjust(scope.row)">调整</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -172,8 +179,11 @@
         </div>
       </div>
     </div>
+    <!-- 核对审核申请分页列表 -->
     <bicyclerebatecheck v-show="viewState == 2" ref="divCheck" @doback="resetState"/>
+    <!-- 新增核对审核申请 -->
     <bicyclerebatecheckAdd v-show="viewState == 3" ref="divCheckAdd" @doback="resetState"/>
+    <!-- 二次调整页面 -->
     <el-dialog center :visible.sync="dialogVisible" width="60%">
       <div class="app-container">
         <div class="tab-header webtop">
@@ -201,13 +211,13 @@
               <span>其中含费用</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><el-input v-model="formobj.firstCost" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input v-model="formobj.firstCost" @input="firstCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>其中含返利</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><el-input v-model="formobj.firstRebate" clearable placeholder=""/></el-form-item>
+              <el-form-item><span>{{ formobj.firstRebate }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title">
@@ -243,13 +253,13 @@
                 <span>其中含费用</span>
               </el-col>
               <el-col :span="4">
-                <el-form-item><el-input v-model="formobj.secondCost" clearable placeholder=""/></el-form-item>
+                <el-form-item><el-input v-model="formobj.secondCost" @input="secondCostInput" clearable placeholder=""/></el-form-item>
               </el-col>
               <el-col :span="4" class="tleftb">
                 <span>其中含返利</span>
               </el-col>
               <el-col :span="4">
-                <el-form-item><el-input v-model="formobj.secondRebate" clearable placeholder=""/></el-form-item>
+                <el-form-item><span>{{ formobj.secondRebate }}</span></el-form-item>
               </el-col>
             </el-row>
             <el-row>
@@ -257,7 +267,7 @@
                 <span>调整金额合计</span>
               </el-col>
               <el-col :span="20">
-                <el-form-item><span>{{ adjustmentMoneyAdd() }}</span></el-form-item>
+                <el-form-item><span>{{ formobj.adjustmentMoney }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -295,13 +305,6 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '核对审核申请'
         },
-        {
-          type: 'primary',
-          size: 'small',
-          icon: '',
-          btnKey: 'toClick',
-          btnLabel: '调整'
-        },
         {
           type: 'info',
           size: 'small',
@@ -373,7 +376,8 @@ export default {
         secondaryUploadMoney: '',
         secondCost: '',
         secondRebate: '',
-        adjustmentMoney: ''
+        adjustmentMoney: '',
+        cost: ''
       }
     }
   },
@@ -451,7 +455,7 @@ export default {
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -486,96 +490,67 @@ export default {
       }
       this.init()
     },
-    UpNumber(e) {
-      e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
-      e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
-      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
-        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
-        console.log(e.target.value)
-        e.target.value = parseFloat(e.target.value)
-      }
-    },
-    changeIsAdjustment(row) {
-      if (row.isAdjustment === '是') {
-        if (row.uploadMoney === '') {
-          row.isAdjustment = ''
-          this.$message({ showClose: true, type: 'error', message: '上传金额不能为空' })
-          return
-        }
-        if (row.money === '') {
-          row.isAdjustment = ''
-          this.$message({ showClose: true, type: 'error', message: '费用不能为空' })
-          return
-        }
-        if (row.stayDetermineMoney === '') {
-          row.isAdjustment = ''
-          this.$message({ showClose: true, type: 'error', message: '待确定金额不能为空' })
-          return
-        }
-        if (row.uploadMoney !== '' && row.money !== '' && row.stayDetermineMoney !== '') {
-          row.adjustmentMoney = parseInt(row.uploadMoney) - parseInt(row.money) - parseInt(row.stayDetermineMoney) - parseInt(row.estimateRebate)
-        }
-      } else if (row.isAdjustment === '否') {
-        row.adjustmentMoney = 0
-        row.adjustmentRemarks = ''
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
       }
+      return val
     },
-    adjustmentMoneyAdd() {
-      this.formobj.adjustmentMoney = parseInt(this.formobj.firstRebate - 0) + parseInt(this.formobj.secondRebate - 0) - parseInt(this.formobj.surplusRebate - 0)
-      return this.formobj.adjustmentMoney
-    },
-    handleSave() {
-      let aa = null
-      if (!this.checked) {
-        aa = {
-          sid: this.formobj.sid,
-          stayDetermineMoney: 0,
-          cost: this.formobj.firstCost,
-          secondaryUploadDate: '',
-          secondaryUploadMoney: 0,
-          adjustmentMoney: this.formobj.firstRebate
+    isAdjustmentInput(row) {
+      let money = '0'
+      // 上传金额 - 费用 - 待确定金额 - 预提返利
+      money = parseFloat(row.uploadMoney !== '' ? row.uploadMoney : 0) - parseFloat(row.money !== '' ? row.money : 0) - parseFloat(row.stayDetermineMoney !== '' ? row.stayDetermineMoney : 0) - parseFloat(row.estimateRebate !== '' ? row.estimateRebate : 0)
+      if (row.stayDetermineMoney === '0') {
+        if (parseFloat(money) > 0) {
+          row.isAdjustment = '是'
+          row.adjustmentMoney = parseFloat(money)
+          row.adjustOrNot = true
+        } else if (parseFloat(money) === 0) {
+          row.isAdjustment = '是'
+          row.adjustmentMoney = parseFloat(money)
+          row.adjustOrNot = false
+        } else {
+          row.isAdjustment = '否'
+          row.adjustmentMoney = '0'
+          row.adjustmentRemarks = ''
+          row.adjustOrNot = true
         }
       } else {
-        aa = {
-          sid: this.formobj.sid,
-          stayDetermineMoney: 0,
-          cost: parseInt(this.formobj.firstCost) + parseInt(this.formobj.secondCost),
-          secondaryUploadDate: this.formobj.secondaryUploadDate,
-          secondaryUploadMoney: this.formobj.secondaryUploadMoney,
-          adjustmentMoney: this.formobj.adjustmentMoney
-        }
+        row.isAdjustment = '否'
+        row.adjustmentMoney = '0'
+        row.adjustmentRemarks = ''
+        row.adjustOrNot = false
       }
-      req.adjustment(aa).then((resp) => {
-        if (resp.success) {
-          this.$message({ showClose: true, type: 'success', message: '保存成功' })
-          this.getList()
-          this.handleReturn()
-        }
-      })
     },
-    handleReturn() {
-      this.dialogVisible = false
-      this.formobj = {
-        sid: '',
-        stayDetermineMoney: '',
-        firstCost: '',
-        firstRebate: '',
-        surplusRebate: '',
-        secondaryUploadDate: '',
-        secondaryUploadMoney: '',
-        secondCost: '',
-        secondRebate: '',
-        adjustmentMoney: ''
+    isAdjustmentChange(val, row) {
+      if (val === '是') {
+        row.adjustmentMoney = parseFloat(row.uploadMoney !== '' ? row.uploadMoney : 0) - parseFloat(row.money !== '' ? row.money : 0) - parseFloat(row.stayDetermineMoney !== '' ? row.stayDetermineMoney : 0) - parseFloat(row.estimateRebate !== '' ? row.estimateRebate : 0)
+      } else if (val === '否') {
+        row.adjustmentMoney = '0'
+        row.adjustmentRemarks = ''
       }
-      this.checked = false
     },
     handleClick() {
       this.viewState = 2
     },
+    // 新增核对审核申请
     toAdd() {
       this.viewState = 3
       this.$refs['divCheckAdd'].showAdd(this.listQuery.params.createOrgSid)
     },
+    // 保存
     toSave(row) {
       if (row.uploadDate === '') {
         this.$message({ showClose: true, type: 'error', message: '上传日期不能为空' })
@@ -593,41 +568,6 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '费用不能为空' })
         return
       }
-      if (row.stayDetermineMoney !== '0') {
-        if (row.isAdjustment === '是') {
-          this.$message({ showClose: true, type: 'error', message: '因待确定金额大于0,是否调整选项需选择否' })
-          return
-        }
-      } else if (row.stayDetermineMoney === '0') {
-        if (row.adjustmentMoney.toString().indexOf('-') !== -1) {
-          if (row.isAdjustment === '是') {
-            this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额小于0,是否调整选项需选择否' })
-            return
-          }
-        } else if (row.adjustmentMoney !== '0') {
-          if (row.isAdjustment === '否') {
-            if ((parseInt(row.uploadMoney) - parseInt(row.estimateRebate)) > 0) {
-              this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额大于0,是否调整选项需选择是' })
-              return
-            }
-          }
-        } else if (row.adjustmentMoney === '0') {
-          if (row.isAdjustment === '否') {
-            this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额等于0,是否调整选项需选择是' })
-            return
-          }
-        }
-      }
-      if (row.isAdjustment === '是') {
-        if (row.adjustmentMoney === '') {
-          this.$message({ showClose: true, type: 'error', message: '调整金额不能为空' })
-          return
-        }
-        if (row.adjustmentRemarks === '') {
-          this.$message({ showClose: true, type: 'error', message: '调整说明不能为空' })
-          return
-        }
-      }
       req.updateDate(row).then((resp) => {
         if (resp.success) {
           this.$message({ showClose: true, type: 'success', message: '保存成功' })
@@ -635,10 +575,7 @@ export default {
         }
       })
     },
-    toInfo(row) {
-      this.viewState = 4
-      this.$refs['divInfo'].showInfo(row)
-    },
+    // 二次调整
     toAdjust(row) {
       this.dialogVisible = true
       this.formobj.stayDetermineMoney = row.stayDetermineMoney
@@ -648,7 +585,71 @@ export default {
       this.formobj.secondCost = 0
       this.formobj.secondRebate = 0
       this.formobj.secondaryUploadMoney = 0
-      this.formobj.surplusRebate = parseInt(row.estimateRebate) - parseInt(row.uploadMoney)
+      this.formobj.cost = row.money
+      this.formobj.surplusRebate = parseFloat(row.estimateRebate !== '' ? row.estimateRebate : 0) - parseFloat(row.uploadMoney !== '' ? row.uploadMoney : 0)
+    },
+    // 二次调整页面--待确定金额模块
+    firstCostInput() {
+      // 其中含返利 = 待确定金额 - 其中含费用
+      this.formobj.firstRebate = parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - parseFloat(this.formobj.firstCost !== '' ? this.formobj.firstCost : 0)
+      this.adjustmentMoneyAdd()
+    },
+    // 二次调整页面--返利二次上传模块
+    secondCostInput() {
+      // 其中含返利 = 二次上传金额 - 其中含费用
+      this.formobj.secondRebate = parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.secondCost !== '' ? this.formobj.secondCost : 0)
+      this.adjustmentMoneyAdd()
+    },
+    // 二次调整页面--返利二次上传模块
+    adjustmentMoneyAdd() {
+      // 调整金额合计 = 其中含返利之和 - 剩余预提返利
+      this.formobj.adjustmentMoney = parseFloat(this.formobj.firstRebate !== '' ? this.formobj.firstRebate : 0) + parseFloat(this.formobj.secondRebate !== '' ? this.formobj.secondRebate : 0) - parseFloat(this.formobj.surplusRebate !== '' ? this.formobj.surplusRebate : 0)
+    },
+    handleSave() {
+      let aa = null
+      if (!this.checked) {
+        aa = {
+          sid: this.formobj.sid,
+          stayDetermineMoney: 0,
+          cost: parseFloat(this.formobj.cost !== '' ? this.formobj.cost : 0) + parseFloat(this.formobj.firstCost !== '' ? this.formobj.firstCost : 0),
+          secondaryUploadDate: '',
+          secondaryUploadMoney: 0,
+          adjustmentMoney: this.formobj.adjustmentMoney
+        }
+      } else {
+        aa = {
+          sid: this.formobj.sid,
+          stayDetermineMoney: 0,
+          cost: parseFloat(this.formobj.cost !== '' ? this.formobj.cost : 0) + parseFloat(this.formobj.firstCost !== '' ? this.formobj.firstCost : 0) + parseFloat(this.formobj.secondCost !== '' ? this.formobj.secondCost : 0),
+          secondaryUploadDate: this.formobj.secondaryUploadDate,
+          secondaryUploadMoney: this.formobj.secondaryUploadMoney,
+          adjustmentMoney: this.formobj.adjustmentMoney
+        }
+      }
+      req.adjustment(aa).then((resp) => {
+        if (resp.success) {
+          this.$message({ showClose: true, type: 'success', message: '保存成功' })
+          this.getList()
+          this.handleReturn()
+        }
+      })
+    },
+    handleReturn() {
+      this.dialogVisible = false
+      this.formobj = {
+        sid: '',
+        stayDetermineMoney: '',
+        firstCost: '',
+        firstRebate: '',
+        surplusRebate: '',
+        secondaryUploadDate: '',
+        secondaryUploadMoney: '',
+        secondCost: '',
+        secondRebate: '',
+        adjustmentMoney: '',
+        cost: ''
+      }
+      this.checked = false
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue

@@ -79,7 +79,7 @@
               <span>预计返利</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ estimateRebateSum() }}</span></el-form-item>
+              <el-form-item><span>{{ estimateRebateSum }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title">

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue

@@ -207,7 +207,6 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
       req.pageList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue

@@ -187,11 +187,10 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
       req.pageList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {

anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue

@@ -207,11 +207,10 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
       req.pageList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue

@@ -187,11 +187,10 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
       req.pageList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java

@@ -12,28 +12,36 @@ public class WmsInventoryAlloSelectList {
 
     //sid
     private String sid;
-    //商品名称
+    //商品spuSid
+    private String goodsSpuSid;
+    //商品spu名称
     private String goodsSpuName;
-    //零件号
+    //商品skuSid
+    private String goodsSkuSid;
+    //商品sku名称
+    private String goodsSkuTitle;
+    //图号
     private String goodsSkuCode;
     //规格
     private String goodsSkuOwnSpec;
-    //车型
-    private String carModel;
+    //厂家sid
+    private String manufacturerSid;
+    //厂家名称
+    private String manufacturerName;
     //商品单位
     private String unit;
     //仓库sid
     private String warehouseSid;
     //仓库名称
     private String warehouseName;
+    //库区sid
+    private String warehouseAreasid;
+    //库区名称
+    private String warehouseArea;
     //库位sid
     private String warehouseRackSid;
     //库位编码
     private String warehouseRackCode;
-    //库位名称
-    private String areaName;
-    //含税价
-    private String taxPrice;
     //库存数量
     private String count;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -238,20 +238,27 @@
 
     <select id="alloGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAlloSelectList">
         SELECT wi.sid,
+        wi.goodsSpuSid,
         wi.goodsSpuName,
+        wi.goodsSkuSid,
+        wi.goodsSkuTitle,
         wi.goodsSkuCode,
         wi.goodsSkuOwnSpec,
+        wi.manufacturerSid,
+        wi.manufacturerName
         wi.unit,
         wi.warehouseSid,
         wi.warehouseName,
+        wa.sid AS warehouseAreasid,
+        wa.areaName AS warehouseArea,
         wi.warehouseRackSid,
         wi.warehouseRackCode,
-        wwa.areaName,
-        wi.count,
-        wi.cost as taxPrice
+        wi.count
         FROM wms_inventory wi
-        LEFT JOIN wms_warehouse_area wwa
-        ON wi.`warehouseRackSid` = wwa.`sid`
+        LEFT JOIN wms_warehouse_rack wr
+        ON wi.warehouseRackSid = wr.sid
+        LEFT JOIN wms_warehouse_area wa
+        ON wr.locationSid = wa.sid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java

@@ -24,8 +24,6 @@ public class WmsInventoryAllocateBill extends BaseEntity {
     private String inPlatName;//调入站名称
     private String inOrgSid;//调入分公司sid
     private String inOrgName;//调入分公司
-    private String count;//调拨数量
-    private String amount;//调拨金额
     private String confirmSid;//确认人sid
     private String confirmName;//确认人姓名
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -40,6 +38,7 @@ public class WmsInventoryAllocateBill extends BaseEntity {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
+    private Integer grade;
     private String createOrgSid;//创建组织sid
     private String createOrgName;//创建组织名称
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java

@@ -83,10 +83,6 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
     private String inOrgSid;
     @ApiModelProperty("调入分公司sid")
     private String inOrgName;
-    @ApiModelProperty("调拨数量")
-    private BigDecimal count;
-    @ApiModelProperty("调拨金额")
-    private BigDecimal amount;
     @ApiModelProperty("确认人sid")
     private String confirmSid;
     @ApiModelProperty("确认人姓名")
@@ -108,6 +104,8 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
+    @ApiModelProperty("调拨等级（1一级站内，2分公司内，3集团内）")
+    private Integer grade;
     @ApiModelProperty("调拨单商品明细")
     private List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocateBillDetailNewList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java

@@ -43,10 +43,6 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
     private String inOrgSid;
     @ApiModelProperty("调入分公司sid")
     private String inOrgName;
-    @ApiModelProperty("调拨数量")
-    private BigDecimal count;
-    @ApiModelProperty("调拨金额")
-    private BigDecimal amount;
     @ApiModelProperty("确认人sid")
     private String confirmSid;
     @ApiModelProperty("确认人姓名")
@@ -68,6 +64,8 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
+    @ApiModelProperty("调拨等级（1一级站内，2分公司内，3集团内）")
+    private Integer grade;
     @ApiModelProperty("调拨单商品明细")
     private List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetail.java

@@ -12,32 +12,30 @@ import java.util.Date;
  */
 @Data
 public class WmsInventoryAllocateBillDetail extends BaseEntity {
-//    private String id;
-//    private String sid= UUID.randomUUID().toString();
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    private Date createTime;
-//    private String remarks;
-//    private String isEnable;
-    private String billSid;//商品ID（唯一编码，入库时生成）
-    private String inventorySid;//商品sid
-    private String goodsSid;//入库单sid
-    private String goodsName;//入库单明细sid
-    private String goodsCode;//销售价格1
-    private String specification;//销售价格2
-    private String goodsModel;//销售价格3
-    private String unit;//销售价格4
-    private String outWarehouseSid;//销售价格5
-    private String outWarehouseName;//计量单位
-    private String warehouseAreasid;//库存数量
-    private String warehouseArea;//销售底价
-    private String taxPrice;//三包价格
-    private String stockCount;//首保价格
-    private String inWarehouseSid;//仓库sid
-    private String inWarehouseName;//仓库名称
-    private String warehouseRackSid;//调入库位sid
-    private String warehouseRackCode;//调入库位编码
-    private String count;//货位
-    private String amount;//是否显示折扣标志
+
+    private String billSid;//主表sid
+    private String inventorySid;//商品库存sid
+    private String goodsID;//商品ID
+    private String goodsSpuSid;//商品spuSid
+    private String goodsSpuName;//商品spu名称
+    private String goodsSkuSid;//商品skuSid
+    private String goodsSkuTitle;//商品sku名称
+    private String goodsSkuCode;//图号
+    private String goodsSkuOwnSpec;//规格型号
+    private String manufacturerSid;//厂家sid
+    private String manufacturerName;//厂家名称
+    private String unit;//单位
+    private String warehouseSid;//仓库sid
+    private String warehouseName;//仓库名称
+    private String warehouseAreasid;//库区sid
+    private String warehouseArea;//库区名称
+    private String warehouseRackSid;//库位sid
+    private String warehouseRackCode;//库位编码
+    private String stockCount;//库存数量
+    private String markUpRatio;//加价比例(%)
+    private String requAmount;//调拔单价
+    private String count;//调拨数量
+    private String amount;//调拨金额（调拨数量*含税价）
 
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDtoNew.java

@@ -17,46 +17,50 @@ public class WmsInventoryAllocateBillDetailDtoNew implements Dto {
 
     private String sid;
 
-    @ApiModelProperty("盘点单sid")
+    @ApiModelProperty("主表sid")
     private String billSid;
     @ApiModelProperty("商品库存sid")
     private String inventorySid;
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品spuSid")
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("单位")
+    private String unit;
     @ApiModelProperty("仓库sid")
     private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
-    @ApiModelProperty("含税价")
-    private BigDecimal taxPrice;
     @ApiModelProperty("库存数量")
     private BigDecimal stockCount;
-    @ApiModelProperty("调入仓库sid")
-    private String inWarehouseSid;
-    @ApiModelProperty("调入仓库名称")
-    private String inWarehouseName;
-    @ApiModelProperty("调入库位sid")
-    private String inWarehouseRackSid;
-    @ApiModelProperty("调入库位编码")
-    private String inWarehouseRackCode;
+    @ApiModelProperty("加价比例(%)")
+    private BigDecimal markUpRatio;
+    @ApiModelProperty("调拔单价")
+    private BigDecimal requAmount;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额（调拨数量*含税价）")
     private BigDecimal amount;
-
-    /*
-     * 页面展示
-     * */
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
-    @ApiModelProperty("零件号")
-    private String goodsSkuCode;
-    @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
-    @ApiModelProperty("车型")
-    private String carModel;
-    @ApiModelProperty("商品单位")
-    private String unit;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java

@@ -33,14 +33,6 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
     public void insertByDto(WmsInventoryAllocateBillDetailDtoNew dto) {
         WmsInventoryAllocateBillDetail entity = new WmsInventoryAllocateBillDetail();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        entity.setOutWarehouseSid(dto.getWarehouseSid());
-        entity.setOutWarehouseName(dto.getWarehouseName());
-        entity.setWarehouseAreasid(dto.getWarehouseRackSid());
-        entity.setWarehouseArea(dto.getWarehouseRackCode());
-        entity.setInWarehouseSid(dto.getInWarehouseSid());
-        entity.setInWarehouseName(dto.getInWarehouseName());
-        entity.setWarehouseRackSid(dto.getInWarehouseRackSid());
-        entity.setWarehouseRackCode(dto.getInWarehouseRackCode());
         baseMapper.insert(entity);
     }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocatebillDetailDetailsVoNew.java

@@ -53,46 +53,50 @@ public class WmsInventoryAllocatebillDetailDetailsVoNew implements Vo {
 
     private String sid;
 
-	@ApiModelProperty("盘点单sid")
+	@ApiModelProperty("主表sid")
     private String billSid;
 	@ApiModelProperty("商品库存sid")
     private String inventorySid;
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品spuSid")
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("单位")
+    private String unit;
     @ApiModelProperty("仓库sid")
     private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
-    @ApiModelProperty("含税价")
-    private BigDecimal taxPrice;
     @ApiModelProperty("库存数量")
     private BigDecimal stockCount;
-    @ApiModelProperty("调入仓库sid")
-    private String inWarehouseSid;
-    @ApiModelProperty("调入仓库名称")
-    private String inWarehouseName;
-    @ApiModelProperty("调入库位sid")
-    private String inWarehouseRackSid;
-    @ApiModelProperty("调入库位编码")
-    private String inWarehouseRackCode;
+    @ApiModelProperty("加价比例(%)")
+    private BigDecimal markUpRatio;
+    @ApiModelProperty("调拔单价")
+    private BigDecimal requAmount;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额（调拨数量*含税价）")
     private BigDecimal amount;
-
-    /*
-    * 页面展示
-    * */
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
-    @ApiModelProperty("零件号")
-    private String goodsSkuCode;
-    @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
-    @ApiModelProperty("车型")
-    private String carModel;
-    @ApiModelProperty("商品单位")
-    private String unit;
 }