2025-06-26 修改

代码维护

.idea/deploymentTargetSelector.xml

@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-04-22T01:07:25.947785800Z">
+        <DropdownSelection timestamp="2025-05-29T08:53:25.402554900Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=3bb3c424" />

.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="2">
@@ -5,6 +6,7 @@
       <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
     </list>
   </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

app/src/main/java/com/pan_american/android/data/model/personnel_module/materials_operate/network/MaterialApplicationRequest.kt

@@ -7,4 +7,6 @@ class MaterialApplicationRequest {
     var quantity = 0.0
     var reason = ""
     var remark = ""
+
+    var isReplace = false
 }

app/src/main/java/com/pan_american/android/ui/document/DocumentGroupListFragment.kt

@@ -114,7 +114,9 @@ class DocumentGroupListFragment : BaseFragment<FragmentDocumentGroupListBinding>
                 call: Call<EntryAndExitGroupListResponse>,
                 response: Response<EntryAndExitGroupListResponse>
             ) {
+
                 val groupNameListResponse = response.body()
+
                 if (groupNameListResponse != null) {
                     if (groupNameListResponse.code == 200) {
 

app/src/main/java/com/pan_american/android/ui/group_airplane_ticket/airplane_payment_insert/AddAirplaneTicketActivity.kt

@@ -95,7 +95,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
     private var cardPaymentResource = CardPaymentResource()
 
-    private val regex = Regex("^-?\\d+(\\.\\d{1,2})?\$")
+    private val regex = Regex("^-?\\d+(\\.\\d{1,2})?$")
 
     private var isAuditGM = -1
 
@@ -743,7 +743,6 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                                     binding.transfer.visibility = View.GONE
                                     binding.remit.visibility = View.GONE
                                 }
-
                             }
 
                             popupWindow.dismiss()
@@ -921,7 +920,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                 airplaneTicketResource.flightsTime = binding.flightTime.text.toString()
             }
 
-            if (customerList.size == 0) {
+            if (customerList.isEmpty()) {
                 showMessage(resources.getString(R.string.customer_select_hint))
                 return@setOnClickListener
             } else {
@@ -1255,6 +1254,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                     call: Call<AirplaneTicketDetailResponse>,
                     response: Response<AirplaneTicketDetailResponse>
                 ) {
+
                     val detailResponse = response.body()
 
                     if (detailResponse != null) {
@@ -1457,7 +1457,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
                             for (item in customerSelected) {
                                 for (selector in customerSelector) {
-                                    if (item.matches(Regex("[0-9]*\$"))) {
+                                    if (item.matches(Regex("[0-9]*$"))) {
                                         if (item.toInt() == selector.id) {
                                             customerList.add(selector)
                                         }

app/src/main/java/com/pan_american/android/ui/group_common/bill_management/BillManagementActivity.kt

@@ -191,6 +191,7 @@ class BillManagementActivity : BaseActivity<ActivityBillManagementBinding>() {
     private fun getSimpleGroupInfoResource(type: Int) {
         OASystem.apiService.getGroupNameWithSearch(simpleGroupInfoRequest).enqueue(object : Callback<SimpleGroupInfoResponse> {
             override fun onResponse(p0: Call<SimpleGroupInfoResponse>, response: Response<SimpleGroupInfoResponse>) {
+
                 val resourceResponse = response.body()
 
                 if (resourceResponse != null) {
@@ -354,6 +355,7 @@ class BillManagementActivity : BaseActivity<ActivityBillManagementBinding>() {
                 call: Call<SelectorResponse>,
                 response: Response<SelectorResponse>
             ) {
+
                 val selectorResponse = response.body()
 
                 if (selectorResponse != null) {
@@ -405,6 +407,7 @@ class BillManagementActivity : BaseActivity<ActivityBillManagementBinding>() {
                 call: Call<BillFileListResponse>,
                 response: Response<BillFileListResponse>
             ) {
+
                 val listResponse = response.body()
 
                 if (listResponse != null) {

app/src/main/res/layout/activity_material_application.xml

@@ -196,6 +196,58 @@
                 android:layout_marginBottom="@dimen/common_padding"
                 android:background="@color/line_color" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/common_padding"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/is_return"
+                    android:textSize="@dimen/text_size_medium" />
+
+                <RadioGroup
+                    android:id="@+id/is_return"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/is_return_yes"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/style_radio_button"
+                        android:buttonTint="@color/title_background_color"
+                        android:text="@string/yes"
+                        android:textColor="@color/text_color" />
+
+                    <RadioButton
+                        android:id="@+id/is_return_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/common_padding"
+                        android:background="@drawable/style_radio_button"
+                        android:buttonTint="@color/title_background_color"
+                        android:checked="true"
+                        android:text="@string/no"
+                        android:textColor="@color/text_color" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_marginTop="@dimen/common_padding"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:background="@color/line_color" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app/src/main/res/values/strings.xml

@@ -1240,6 +1240,7 @@
     <string name="material_base_data_get_error">物资进存销基础数据源获取失败</string>
     <string name="material_search_error">物资列表数据查询失败</string>
 
+    <string name="is_return">是否归还</string>
     <!--    <string name="material_application">物品领用</string>-->
     <string name="application_count">领用数量</string>
     <string name="application_reason">领用原由</string>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Jun 10 16:01:51 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists