修改销售订单问题

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java

@@ -51,6 +51,7 @@ import java.util.*;
 
 import jnpf.util.file.UploadUtil;
 import jnpf.util.enums.FileTypeEnum;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  *
@@ -488,7 +489,30 @@ public class ArinvoicesController {
     }
 
 
+    /**
+     * 上传文件(excel)
+     *
+     * @return
+     */
+    @ApiOperation("上传文件")
+    @PostMapping("/Uploader")
+    public ActionResult Uploader() {
+        List<MultipartFile> list = UpUtil.getFileAll();
+        MultipartFile file = list.get(0);
+        if (file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls")) {
+            String filePath = configValueUtil.getTemporaryFilePath();
+            String fileName = RandomUtil.uuId() + "." + UpUtil.getFileType(file);
+            fileName = XSSEscape.escape(fileName);
+            //上传文件
+            FileUtil.upFile(file, filePath, fileName);
+            DownloadVO vo = DownloadVO.builder().build();
+            vo.setName(fileName);
+            return ActionResult.success(vo);
+        } else {
+            return ActionResult.fail("选择文件不符合导入");
+        }
 
+    }
 
 
 

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java

@@ -156,7 +156,8 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
         }
         //排序
         if(StringUtil.isEmpty(arinvoicesPagination.getSidx())){
-        arinvoicesQueryWrapper.lambda().orderByDesc(ArinvoicesEntity::getId);
+            arinvoicesPagination.setSidx("CREATOR_TIME");
+            arinvoicesPagination.setSort("DESC");
         }else{
             try {
                 String sidx = arinvoicesPagination.getSidx();
@@ -164,7 +165,8 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
                 Field declaredField = arinvoicesEntity.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                arinvoicesQueryWrapper="asc".equals(arinvoicesPagination.getSort().toLowerCase())?arinvoicesQueryWrapper.orderByAsc(value):arinvoicesQueryWrapper.orderByDesc(value);
+                arinvoicesPagination.setSidx(value);
+//                arinvoicesQueryWrapper="asc".equals(arinvoicesPagination.getSort().toLowerCase())?arinvoicesQueryWrapper.orderByAsc(value):arinvoicesQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }

SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java

@@ -127,7 +127,8 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         }
         //排序
         if(StringUtil.isEmpty(collectionPagination.getSidx())){
-        collectionQueryWrapper.lambda().orderByDesc(CollectionEntity::getId);
+            collectionPagination.setSidx("CREATOR_TIME");
+            collectionPagination.setSort("DESC");
         }else{
             try {
                 String sidx = collectionPagination.getSidx();
@@ -135,7 +136,8 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
                 Field declaredField = collectionEntity.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                collectionQueryWrapper="asc".equals(collectionPagination.getSort().toLowerCase())?collectionQueryWrapper.orderByAsc(value):collectionQueryWrapper.orderByDesc(value);
+                collectionPagination.setSidx(value);
+//                collectionQueryWrapper="asc".equals(collectionPagination.getSort().toLowerCase())?collectionQueryWrapper.orderByAsc(value):collectionQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java

@@ -129,7 +129,8 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         }
         //排序
         if(StringUtil.isEmpty(receiptoutPagination.getSidx())){
-        receiptoutQueryWrapper.lambda().orderByDesc(ReceiptoutEntity::getId);
+            receiptoutPagination.setSidx("CREATOR_TIME");
+            receiptoutPagination.setSort("DESC");
         }else{
             try {
                 String sidx = receiptoutPagination.getSidx();
@@ -137,7 +138,8 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
                 Field declaredField = receiptoutEntity.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                receiptoutQueryWrapper="asc".equals(receiptoutPagination.getSort().toLowerCase())?receiptoutQueryWrapper.orderByAsc(value):receiptoutQueryWrapper.orderByDesc(value);
+                receiptoutPagination.setSidx(value);
+//                receiptoutQueryWrapper="asc".equals(receiptoutPagination.getSort().toLowerCase())?receiptoutQueryWrapper.orderByAsc(value):receiptoutQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java

@@ -422,15 +422,10 @@ public class SaleorderitemController {
         for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
             PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
             if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getPurchaseStatus() != null){
-                if (!poundlistEntity.getPurchaseStatus().equals("2") || !poundlistEntity.getPurchaseStatus().equals("3")){
+                if (!poundlistEntity.getPurchaseStatus().equals("2") && !poundlistEntity.getPurchaseStatus().equals("3")){
                     return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开票或未入库");
                 }
             }
-//            if (ObjectUtils.isNotEmpty(poundlistEntity)){
-//                if (poundlistEntity.getIsInvoicing().equals("0")){
-//                    return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开进项票");
-//                }
-//            }
         }
         String mainId =RandomUtil.uuId();
         UserInfo userInfo=userProvider.get();

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java

@@ -250,7 +250,8 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         }
         //排序
         if(StringUtil.isEmpty(saleorderitemPagination.getSidx())){
-        saleorderitemQueryWrapper.lambda().orderByDesc(SaleorderitemEntity::getId);
+            saleorderitemPagination.setSidx("CREATOR_TIME");
+            saleorderitemPagination.setSort("DESC");
         }else{
             try {
                 String sidx = saleorderitemPagination.getSidx();
@@ -258,7 +259,8 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
                 Field declaredField = saleorderitemEntity.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                saleorderitemQueryWrapper="asc".equals(saleorderitemPagination.getSort().toLowerCase())?saleorderitemQueryWrapper.orderByAsc(value):saleorderitemQueryWrapper.orderByDesc(value);
+                saleorderitemPagination.setSidx(value);
+//                saleorderitemQueryWrapper="asc".equals(saleorderitemPagination.getSort().toLowerCase())?saleorderitemQueryWrapper.orderByAsc(value):saleorderitemQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }

SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml

@@ -29,6 +29,9 @@
     <if test="arinvoicesPagination.startDate != null and arinvoicesPagination.endDate != null">
         and a.business_date &gt; #{arinvoicesPagination.startDate} AND a.business_date &lt;= #{arinvoicesPagination.endDate}
     </if>
+    <if test="arinvoicesPagination.sidx != null and arinvoicesPagination.sidx != ''">
+        ORDER BY ${arinvoicesPagination.sidx} ${arinvoicesPagination.sort}
+    </if>
 </select>
 
 </mapper>

SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml

@@ -26,6 +26,9 @@
         <if test="collectionPagination.customerNm != null and collectionPagination.customerNm != ''">
             and b.supplier_nm  LIKE CONCAT('%',#{collectionPagination.customerNm},'%')
         </if>
+        <if test="collectionPagination.sidx != null and collectionPagination.sidx != ''">
+            ORDER BY ${collectionPagination.sidx} ${collectionPagination.sort}
+        </if>
     </select>
 
 </mapper>

SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml

@@ -27,6 +27,9 @@
     <if test="receiptoutPagination.startDate != null and receiptoutPagination.endDate != null">
         and a.creator_time &gt; #{receiptoutPagination.startDate} AND a.creator_time &lt;= #{receiptoutPagination.endDate}
     </if>
+    <if test="receiptoutPagination.sidx != null and receiptoutPagination.sidx != ''">
+        ORDER BY ${receiptoutPagination.sidx} ${receiptoutPagination.sort}
+    </if>
 </select>
 
 </mapper>

SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml

@@ -28,6 +28,9 @@
     <if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null">
         and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.creator_time &lt;= #{saleorderitemPagination.endDate}
     </if>
+    <if test="saleorderitemPagination.sidx != null and saleorderitemPagination.sidx != ''">
+        ORDER BY ${saleorderitemPagination.sidx} ${saleorderitemPagination.sort}
+    </if>
 
 </select>
 

SC-web/src/views/scm/basicInformation/arinvoices/Form.vue

@@ -307,17 +307,20 @@
 </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
+        <el-button type="primary" icon="el-icon-upload2" @click="uploadForm">导入</el-button>
         <el-button @click="visible = false"> 取 消</el-button>
         <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
     </span>
+  <ImportForm v-if="importFormVisible" ref="importForm" @importData="importData" />
     </el-dialog>
 </template>
 <script>
     import request from '@/utils/request'
     import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import ImportForm from '../saleorder/ImportForm'
     export default {
-        components: {},
+        components: { ImportForm },
         props: [],
         data() {
             return {
@@ -362,6 +365,30 @@
         },
         mounted() {},
         methods: {
+          importData(param){
+            param.checkedList.forEach((column, index) => {
+              if(column.taxRate == '0.13'){
+                column.taxRate = '0';
+              }else if(column.taxRate == '0.09'){
+                column.taxRate = '1';
+              }else if(column.taxRate == '0.06'){
+                column.taxRate = '2';
+              }else if(column.taxRate == '0.05'){
+                column.taxRate = '3';
+              }else if(column.taxRate == '0.03'){
+                column.taxRate = '4';
+              }else if(column.taxRate == '0'){
+                column.taxRate = '5';
+              }
+              this.dataForm.invoicesitem0List.push(column);
+            });
+          },
+          uploadForm() {
+            this.importFormVisible = true
+            this.$nextTick(() => {
+              this.$refs.importForm.init()
+            })
+          },
           getSummaries(param) {
             const { columns, data } = param;
             const sums = [];

SC-web/src/views/scm/basicInformation/saleorder/Detail.vue

@@ -494,7 +494,7 @@
                         salesbacksoitemList:[],
                         paymentsoitemList:[],
             },
-                            activemtmitd:'1',
+                            activemtmitd:'0',
                                 currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                                 statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
 

SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue

@@ -319,21 +319,25 @@
 </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
+        <el-button type="primary" icon="el-icon-upload2" @click="uploadForm">导入</el-button>
         <el-button @click="visible = false"> 取 消</el-button>
         <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
     </span>
+        <ImportForm v-if="importFormVisible" ref="importForm" @importData="importData" />
     </el-dialog>
 </template>
 <script>
     import request from '@/utils/request'
     import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import ImportForm from './ImportForm'
 
     export default {
-        components: {},
+        components: { ImportForm },
         props: [],
         data() {
             return {
+              importFormVisible: false,
                 visible: false,
                 loading: false,
                 isDetail: false,
@@ -378,6 +382,30 @@
         },
         mounted() {},
         methods: {
+          importData(param){
+            param.checkedList.forEach((column, index) => {
+              if(column.taxRate == '0.13'){
+                column.taxRate = '0';
+              }else if(column.taxRate == '0.09'){
+                column.taxRate = '1';
+              }else if(column.taxRate == '0.06'){
+                column.taxRate = '2';
+              }else if(column.taxRate == '0.05'){
+                column.taxRate = '3';
+              }else if(column.taxRate == '0.03'){
+                column.taxRate = '4';
+              }else if(column.taxRate == '0'){
+                column.taxRate = '5';
+              }
+              this.dataForm.invoicesitem0List.push(column);
+            });
+          },
+          uploadForm() {
+            this.importFormVisible = true
+            this.$nextTick(() => {
+              this.$refs.importForm.init()
+            })
+          },
           getSummaries(param) {
             const { columns, data } = param;
             const sums = [];